- fixed usage of macros

- added/removed neccesary/obsolete patches
- FHS 2.0 compliance where needed
- gzipping docs where needed

Changed files:
    metamail.spec -> 1.11

diff --git a/metamail.spec b/metamail.spec
index a6686766f00d4b39a6601df26acd2eb685379886..fd86a4112560307a382b918b1fef6f56aacf05da 100644 (file)
--- a/metamail.spec
+++ b/metamail.spec
@@ -4,7 +4,7 @@ Summary(fr):    Ensemble d'utilitaires de gestion MIME
 Summary(tr):   MIME iþleme araçlarý
 Name:          metamail
 Version:       2.7
-Release:       19
+Release:       20
 Copyright:     Distributable
 Group:         Applications/Mail
 Source:                ftp://thumper.bellcore.com/pub/nsp/metamail/mm%{version}.tar.Z
@@ -25,14 +25,14 @@ BuildRoot:  /tmp/%{name}-%{version}-root
 Metamail is an implementation of MIME, the Multipurpose Internet Mail
 Extensions, a proposed standard for multimedia mail on the Internet.
 Metamail implements MIME, and also implements extensibility and
-configuration via the "mailcap" mechanism described in an informational RFC
-that is a companion to the MIME document.
+configuration via the "mailcap" mechanism described in an
+informational RFC that is a companion to the MIME document.
 
 %description -l pl
-Metamail obs³uguje standard MIME (rozszerzenie poczty internetowej dla
-ró¿nych celów) u¿ywany do przesy³ania poczt± plików multimedialnych. MIME
-jest te¿ wykorzystywany do kodowania znaków narodowych w listach i
-artyku³ach news.
+Metamail obs³uguje standard MIME (rozszerzenie poczty internetowej
+dla ró¿nych celów) u¿ywany do przesy³ania poczt± plików 
+multimedialnych. MIME jest te¿ wykorzystywany do kodowania znaków
+narodowych w listach i artyku³ach news.
 
 %prep
 %setup -q -n mm2.7
@@ -52,26 +52,30 @@ make basics
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/metamail/fonts,%{_mandir}/man1}
+mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_libdir}/metamail/fonts,%{_mandir}/man1}
 
 cd src
-make INSTROOT=$RPM_BUILD_ROOT%{_prefix} install-all
+make install-all INSTROOT=$RPM_BUILD_ROOT/usr \
+       MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+       MAN4DIR=$RPM_BUILD_ROOT%{_mandir}/man4
 
 install fonts/*.pcf $RPM_BUILD_ROOT%{_libdir}/metamail/fonts
 install fonts/fonts.alias $RPM_BUILD_ROOT%{_libdir}/metamail/fonts
 mkfontdir $RPM_BUILD_ROOT%{_libdir}/metamail/fonts
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/*.orig
+rm -f $RPM_BUILD_ROOT%{_bindir}/*~
+
+gzip -9nf README CREDITS mailers.txt \
+       $RPM_BUILD_ROOT%{_mandir}/man1/*
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       src/README src/CREDITS src/mailers.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {src/README,src/CREDITS,src/mailers.txt}.gz
+%doc src/{README,CREDITS,mailers.txt}.gz
 %{_libdir}/metamail
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*