- misc fixes and cleanups

Changed files:
    fvwm2.spec -> 1.2

diff --git a/fvwm2.spec b/fvwm2.spec
index 7a03c42801c239601c62da7b706fbf09eda69b80..e5191e648af645d4ef1438364ec82bee6b627e11 100644 (file)
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -1,17 +1,19 @@
-Summary: An improved version of the FVWM X-based window manager.
-Name: fvwm2
-Version: 2.2
-Release: 5
-Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-2.2.tar.gz
-Source1: fvwm-2.0.46.icons.tar.gz
-Source2: compat-icons.tar.gz
-Patch0: fvwm-2.2-redhat.patch
-Copyright: GPL
-Group: User Interface/Desktops
-Buildroot: /var/tmp/fvwm2-root
-Requires: fvwm2-icons
-Url: http://fvwm.math.uh.edu/
-Obsoletes: fvwm95
+Summary:       An improved version of the FVWM X-based window manager.
+Name:          fvwm2
+Version:       2.2
+Release:       6
+Source0:       ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-2.2.tar.gz
+Source1:       fvwm-2.0.46.icons.tar.gz
+Patch0:                fvwm-2.2-redhat.patch
+Copyright:     GPL
+Group:         User Interface/Desktops
+Buildroot:     /tmp/%{name}-%{version}-root
+Requires:      fvwm2-icons
+Url:           http://fvwm.math.uh.edu/
+Obsoletes:     fvwm95
+
+%define                _prefix /usr/X11R6
+%define                _mandir /usr/X11R6/man
 
 %description
 FVWM2 (the F stands for whatever you want, but the VWM stands for
@@ -23,9 +25,9 @@ Install the fvwm2 package if you'd like to use the FVWM2 window manager.
 If you install fvwm2, you'll also need to install fvwm2-icons.
 
 %package icons
-Summary: Graphic files used by the FVWM and FVWM2 window managers.
-Group: User Interface/Desktops
-Obsoletes: fvwm95-icons
+Summary:       Graphic files used by the FVWM and FVWM2 window managers.
+Group:         User Interface/Desktops
+Obsoletes:     fvwm95-icons
 
 %description icons
 The fvwm2-icons package contains icons, bitmaps and pixmaps used by
@@ -36,45 +38,56 @@ fvwm2.
 
 %prep
 %setup -n fvwm-%{version} -q
-%patch0 -p1 -b .redhat
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
-       --prefix=/usr/X11R6 --enable-extras \
+       --prefix=%{_prefix} \
+       --enable-extras \
        --libexecdir=\${prefix}/lib/X11/fvwm2   \
-       --sysconfdir=/etc/X11/fvwm2
+       --sysconfdir=/etc/X11/fvwm2 \
+       --mandir=%{_mandir}
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install prefix=$RPM_BUILD_ROOT/usr/X11R6 \
+mkdir -p $RPM_BUILD_ROOT/etc/X11/fvwm2
+
+make install \
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
        sysconfdir=$RPM_BUILD_ROOT/etc/X11/fvwm2 \
+       mandir=$RPM_BUILD_ROOT%{_mandir} \
        INSTALL_PROGRAM="/usr/bin/install -c -s"
-mkdir -p $RPM_BUILD_ROOT/etc/X11/fvwm2
+
 install -m 644 sample.fvwmrc/system.fvwm2rc $RPM_BUILD_ROOT/etc/X11/fvwm2
 rm -rf $RPM_BUILD_ROOT/usr/share/icons
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/mini
-install -m 644 icons/*.xpm $RPM_BUILD_ROOT/usr/share/icons
-mv $RPM_BUILD_ROOT/usr/share/icons/mini.*.xpm $RPM_BUILD_ROOT/usr/share/icons/mini
-# install compatibility icons
-tar xvzf $RPM_SOURCE_DIR/compat-icons.tar.gz -C $RPM_BUILD_ROOT
+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
+
+strip --strip-unneeded $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/X11/fvwm2}/* || :
+
+gzip -9nf README AUTHORS NEWS ChangeLog \
+       $RPM_BUILD_ROOT%{_mandir}/man1/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc INSTALL README AUTHORS INSTALL.fvwm NEWS ChangeLog
+%defattr(644,root,root,755)
+%doc {README,AUTHORS,NEWS,ChangeLog}.gz
 %doc docs
-/usr/X11R6/lib/X11/fvwm2
-/usr/X11R6/man/man1/*
-/usr/X11R6/bin/*
 %dir /etc/X11/fvwm2
 %config /etc/X11/fvwm2/*
+%dir %{_libdir}/X11/fvwm2
+%attr(755,root,root) %{_libdir}/X11/fvwm2/*
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man1/*
 
 %files icons
-%defattr(-,root,root)
-%dir /usr/share/icons
-%dir /usr/share/icons/mini
-/usr/share/icons/*.xpm
-/usr/share/icons/mini/*.xpm
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%defattr(644,root,root,755)
+%dir %{_datadir}/icons
+%dir %{_datadir}/icons/mini
+%{_datadir}/icons/*.xpm
+%{_datadir}/icons/mini/*.xpm