- release 4,

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 5801c001809dc218c2dd1fe87b52fe0563205c70..22a0c1f2877694b499c2d3259c157417f486880a 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -5,7 +5,7 @@ Summary(fr):    Gestionnaire de fen
 Summary(pl):   Mened¿er okien w stylu NeXT
 Name:          WindowMaker
 Version:       0.64.0
-Release:       1
+Release:       4
 Group:         X11/Window Managers
 Group(es):     X11/Administraadores De Ventanas
 Group(fr):     X11/Gestionnaires De Fenêtres
@@ -47,6 +47,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 %define                _sysconfdir     /etc/X11
+%define                _wmpropsdir     %{_datadir}/wm-properties
 
 %description
 Window Maker is an X11 window manager which emulates the look and feel
@@ -108,9 +109,9 @@ Ten pakiet zawiera biblioteki wsp
 mened¿era okien WindowMaker.
 
 %package devel
-Summary:       WindowMaker libraries
+Summary:       WindowMaker libraries - development part
 Summary(fr):   Librairies de WindowMaker
-Summary(pl):   Biblioteki WindowMakera
+Summary(pl):   Biblioteki WindowMakera - czê¶æ dla programistów
 Group:         Development/Libraries
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
@@ -169,6 +170,7 @@ CPP_PATH="/lib/cpp" ; export CPP_PATH
 
 %configure \
        --with-nlsdir=%{_datadir}/locale \
+       --with-appspath=%{_libdir}/GNUstep/Apps \
        --enable-sound \
        --enable-gnome \
        --disable-debug \
@@ -182,8 +184,8 @@ touch WindowMaker/Defaults/W*.in
 %{__make} \
        LINGUAS="cs de el es fi fr gl hr it ja ko nl no pl pt ro ru  \
                se sk tr zh_CN zh_TW.Big5" \
-       CFLAGS="$RPM_OPT_FLAGS" \
-       LDFLAGS="-s" 
+       CFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmldflags}"
 
 autoconf
 cd %{name}-extra-%{extraver}
@@ -193,7 +195,7 @@ cd %{name}-extra-%{extraver}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/{pixmaps,gnome/wm-properties} \
+install -d $RPM_BUILD_ROOT{%{_datadir}/pixmaps,%{_wmpropsdir}} \
        $RPM_BUILD_ROOT/etc/sysconfig/wmstyle
 
 %{__make} install \
@@ -207,7 +209,7 @@ install contrib/dockit   $RPM_BUILD_ROOT%{_bindir}
 install contrib/dockit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install WindowMaker-data/pixmaps/* $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install %{SOURCE3} $RPM_BUILD_ROOT%{_wmpropsdir}
 
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
@@ -238,7 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %{_pixmapsdir}/*
-%{_datadir}/gnome/wm-properties/WindowMaker.desktop
+%{_wmpropsdir}/WindowMaker.desktop
 
 %attr(755,root,root) %{_bindir}/bughint
 %attr(755,root,root) %{_bindir}/geticonset
@@ -261,16 +263,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_datadir}/WindowMaker
 
-%dir %{_prefix}/GNUstep
-%dir %{_prefix}/GNUstep/Apps
-%dir %{_prefix}/GNUstep/Apps/WPrefs.app
+%dir %{_libdir}/GNUstep
+%dir %{_libdir}/GNUstep/Apps
+%dir %{_libdir}/GNUstep/Apps/WPrefs.app
 
-%attr(755,root,root) %{_prefix}/GNUstep/Apps/WPrefs.app/WPrefs
+%attr(755,root,root) %{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs
 
-%{_prefix}/GNUstep/Apps/WPrefs.app/tiff
-%{_prefix}/GNUstep/Apps/WPrefs.app/xpm
-%{_prefix}/GNUstep/Apps/WPrefs.app/WPrefs.tiff
-%{_prefix}/GNUstep/Apps/WPrefs.app/WPrefs.xpm
+%{_libdir}/GNUstep/Apps/WPrefs.app/tiff
+%{_libdir}/GNUstep/Apps/WPrefs.app/xpm
+%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.tiff
+%{_libdir}/GNUstep/Apps/WPrefs.app/WPrefs.xpm
 
 %files libs
 %defattr(644,root,root,755)
@@ -284,7 +286,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_bindir}/get-wraster-flags
-%{_includedir}/*.h
+%{_includedir}/*
 %{_libdir}/lib*.la
 
 %files static