- cleanup for PLD

- FHS 2.0
- gziping man pages

Changed files:
    elm.spec -> 1.2

diff --git a/elm.spec b/elm.spec
index 35c766ca86e0ae5d203d7a50b47934e2455485e8..f90a2e5abe862dff7bd28f4b1bfd97bdb6d38ee0 100644 (file)
--- a/elm.spec
+++ b/elm.spec
@@ -1,15 +1,15 @@
-Summary: The elm mail user agent.
-Name: elm
-Version: 2.5.0
-Release: 0.2pre8
-Copyright: distributable
-Group: Applications/Internet
-Url: http://www.myxa.com/elm.html
-Source0: ftp://dsinc.myxa.com/pub/elm/elm2.5.0pre8.tar.gz
-Source1: elm.wmconfig
-Patch0: elm-2.5.0pre8-config.patch
-Patch1: elm-2.5.0pre8-compat21.patch
-BuildRoot: /var/tmp/%{name}-root
+Summary:       The elm mail user agent.
+Name:          elm
+Version:       2.5.0
+Release:       0.3pre8
+Copyright:     distributable
+Group:         Applications/Mail
+Url:           http://www.myxa.com/elm.html
+Source0:       ftp://dsinc.myxa.com/pub/elm/elm2.5.0pre8.tar.gz
+Source1:       elm.wmconfig
+Patch0:                elm-2.5.0pre8-config.patch.gz
+Patch1:                elm-2.5.0pre8-compat21.patch
+BuildRoot:     /tmp/%{name}-%{version}-root
 
 %description
 Elm is a popular terminal mode email user agent. Elm includes all
@@ -22,9 +22,8 @@ also need to install the metamail package.
 
 %prep
 %setup -q -n elm2.5.0pre8
-
-%patch0 -p1 -b .p11
-%patch1 -p1 -b .p17
+%patch0 -p1
+%patch1 -p1
 
 %build
 mkdir -p bin
@@ -34,51 +33,55 @@ strip bin/* || :
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,lib/elm,man/man1}
+install -d  $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/elm,%{_mandir}/man1}
 
-make   DESTBIN=$RPM_BUILD_ROOT/usr/bin \
-       BIN=$RPM_BUILD_ROOT/usr/bin \
-       DESTLIB=$RPM_BUILD_ROOT/usr/lib/elm \
-       LIB=$RPM_BUILD_ROOT/usr/lib/elm \
-       MAN=$RPM_BUILD_ROOT/usr/man/man1 \
+make   DESTBIN=$RPM_BUILD_ROOT%{_bindir} \
+       BIN=$RPM_BUILD_ROOT%{_bindir} \
+       DESTLIB=$RPM_BUILD_ROOT%{_datadir}/elm \
+       LIB=$RPM_BUILD_ROOT%{_datadir}/elm \
+       MAN=$RPM_BUILD_ROOT%{_mandir}/man1 \
        install
 
 ( cd $RPM_BUILD_ROOT
-  mkdir -p ./etc/X11/wmconfig
+  install -d ./etc/X11/wmconfig
   install -m 644 $RPM_SOURCE_DIR/elm.wmconfig ./etc/X11/wmconfig/elm
 )
- 
+
+strip --strip-unneeded $RPM_BUILD_ROOT%{_bindir}/* || :
+
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(644,root,root,755)
 %config(missingok) /etc/X11/wmconfig/elm
-/usr/bin/elm
-/usr/bin/answer
-/usr/bin/checkalias
-/usr/bin/elmalias
-/usr/bin/fastmail
-/usr/bin/frm
-/usr/bin/listalias
-/usr/bin/messages
-/usr/bin/newalias
-/usr/bin/newmail
-/usr/bin/printmail
-/usr/bin/readmsg
-/usr/lib/elm
-/usr/bin/wnewmail
-/usr/bin/nfrm
-/usr/man/man1/answer.1
-/usr/man/man1/checkalias.1
-/usr/man/man1/elm.1
-/usr/man/man1/elmalias.1
-/usr/man/man1/fastmail.1
-/usr/man/man1/frm.1
-/usr/man/man1/listalias.1
-/usr/man/man1/messages.1
-/usr/man/man1/newalias.1
-/usr/man/man1/newmail.1
-/usr/man/man1/printmail.1
-/usr/man/man1/readmsg.1
-/usr/man/man1/wnewmail.1
+%attr(755,root,root) %{_bindir}/elm
+%attr(755,root,root) %{_bindir}/answer
+%attr(755,root,root) %{_bindir}/checkalias
+%attr(755,root,root) %{_bindir}/elmalias
+%attr(755,root,root) %{_bindir}/fastmail
+%attr(755,root,root) %{_bindir}/frm
+%attr(755,root,root) %{_bindir}/listalias
+%attr(755,root,root) %{_bindir}/messages
+%attr(755,root,root) %{_bindir}/newalias
+%attr(755,root,root) %{_bindir}/newmail
+%attr(755,root,root) %{_bindir}/printmail
+%attr(755,root,root) %{_bindir}/readmsg
+%attr(755,root,root) %{_bindir}/wnewmail
+%attr(755,root,root) %{_bindir}/nfrm
+%{_datadir}/elm
+%{_mandir}/man1/answer.1.gz
+%{_mandir}/man1/checkalias.1.gz
+%{_mandir}/man1/elm.1.gz
+%{_mandir}/man1/elmalias.1.gz
+%{_mandir}/man1/fastmail.1.gz
+%{_mandir}/man1/frm.1.gz
+%{_mandir}/man1/listalias.1.gz
+%{_mandir}/man1/messages.1.gz
+%{_mandir}/man1/newalias.1.gz
+%{_mandir}/man1/newmail.1.gz
+%{_mandir}/man1/printmail.1.gz
+%{_mandir}/man1/readmsg.1.gz
+%{_mandir}/man1/wnewmail.1.gz