- moved /usr/X11R6/share/gnome/wm-properties to /usr/X11R6/share/wm-properties

Changed files:
    fvwm2.spec -> 1.12

diff --git a/fvwm2.spec b/fvwm2.spec
index e4bc5bea5a9c91a6097c999d5463a05468e5cb85..99b66a94544c672a2851828e73ff78cc51a5a540 100644 (file)
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -22,8 +22,9 @@ Requires:     m4
 Requires:      xinitrc >= 3.0
 Obsoletes:     fvwm95
 
-%define                _prefix /usr/X11R6
-%define                _mandir /usr/X11R6/man
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+%define                _wmpropsdir     %{_datadir}/wm-properties
 
 %description
 FVWM2 (the F stands for whatever you want, but the VWM stands for
@@ -65,21 +66,20 @@ fvwm2.
 %patch0 -p1
 
 %build
-CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions" \
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
+CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" \
+CFLAGS="%{rpmcflags}" ./configure \
        --prefix=%{_prefix} \
        --enable-extras \
        --libexecdir=\${prefix}/lib/X11/fvwm2   \
        --sysconfdir=%{_sysconfdir}/X11/fvwm2 \
        --mandir=%{_mandir}
 %{__make} \
-       CFLAGS="$RPM_OPT_FLAGS" \
-       CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
+       CFLAGS="%{rpmcflags}" \
+       CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm2} \
-       $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig/wmstyle,X11/fvwm2},%{_wmpropsdir}}
 
 %{__make} install \
        prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -93,9 +93,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 install -d $RPM_BUILD_ROOT%{_datadir}/icons/mini
 
 install icons/*.xpm $RPM_BUILD_ROOT%{_datadir}/icons
-mv $RPM_BUILD_ROOT%{_datadir}/icons/mini.*.xpm $RPM_BUILD_ROOT%{_datadir}/icons/mini
+mv -f $RPM_BUILD_ROOT%{_datadir}/icons/mini.*.xpm $RPM_BUILD_ROOT%{_datadir}/icons/mini
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install %{SOURCE2} $RPM_BUILD_ROOT%{_wmpropsdir}
 
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
@@ -103,10 +103,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
 # consflicts with gimp
 rm -f $RPM_BUILD_ROOT/usr/X11R6/share/icons/{folder,question}.xpm
 
-strip --strip-unneeded $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/X11/fvwm2}/* || :
-
-gzip -9nf README AUTHORS NEWS ChangeLog \
-       $RPM_BUILD_ROOT%{_mandir}/man1/*
+gzip -9nf README AUTHORS NEWS ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/X11/fvwm2
 %attr(755,root,root) %{_libdir}/X11/fvwm2/*
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/gnome/wm-properties/fvwm2.desktop
+%{_wmpropsdir}/fvwm2.desktop
 %{_mandir}/man1/*
 
 %files icons