FHS 2.0

some macros
major changes

Changed files:
    sendmail.spec -> 1.8

diff --git a/sendmail.spec b/sendmail.spec
index a8137289679c5065bd1fb77f422468f0d205e488..3a8c24ea3f819f308a4094b28d94a155ebf7f2b7 100644 (file)
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -1,28 +1,31 @@
 Summary:       Sendmail -- mail transport agent
 Summary(pl):   Sendmail -- aplikacja do obs³ugi poczty elektronicznej
 Name:          sendmail
-Version:       8.9.2
-Release:       3d
+Version:       8.9.3
+Release:       2
 Copyright:     distributable (similar to, but not quite BSD)
-Group:         Networking/Daemons
-Group(pl):     Sieci/Demony
-URL:           http://www.sendmail.org
+Group:         Daemons
+Group(pl):     Serwery
 Source0:       ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
 Source1:       site.Linux.m4
 Source2:       aliases
 Source3:       %{name}.init
 Source4:       site.Linux.ppc.m4
-Patch0:                %{name}-ip6.patch
-Patch1:                %{name}-telnet.patch
+Source5:       %{name}.sysconfig
+Patch0:                %{name}-ipv6.patch
+Patch1:                %{name}-dtelnet.patch
 Patch2:                %{name}-path.patch
 Patch3:                %{name}-rmail.patch
 Patch4:                %{name}-pld.mc.patch
-Patch5:                %{name}-DoS.patch
-Patch6:                %{name}-redirect.patch
-Provides:      smtpdaemon
-Obsoletes:     smtpdaemon
-Prereq:                /sbin/chkconfig
+Patch5:                %{name}-redirect.patch
+Patch6:                %{name}-smrsh.patch
 BuildRoot:     /tmp/%{name}-%{version}-root
+URL:           http://www.sendmail.org
+Prereq:                /sbin/chkconfig
+Provides:      smtpdaemon
+Obsoletes:     zmail
+Obsoletes:     qmail
+Obsoletes:     smail
 
 %description 
 Sendmail is a Mail Transport Agent, which is the program
@@ -36,21 +39,21 @@ you'll need sendmail.
 
 %description -l pl
 Sendmail jest programem umo¿liwiaj±cym wymianê poczty elektronicznej
-miêdzy komputerami w sieci Internet. Zajmuje siê przekazywaniem poczty
+miêdzy komputerami w sieci internet. Zajmuje siê przekazywaniem poczty
 elektronicznej miêdzy bramkami pocztowymi i dostarczaniem przesy³ek na 
 konta docelowe. Bardzo dobrze obs³uguje aliasy pocztowe a jego dodatkowym 
 atutem jest prosta konfiguracja. Dziêki rozbudowanym mo¿liwo¶ciom 
 konfiguracyjnym jest w stanie dostarczaæ przesy³ki za po¶rednictwem 
 protoko³ów: SMTP, ESMTP, UUCP, X.400 i innych.
 
-Je¿eli masz zamiar korzystaæ z poczty elektronicznej w sieci Internet
+Je¿eli masz zamiar korzystaæ z poczty elektronicznej w sieci internet
 oraz 6bone to zainstaluj ten pakiet.
 
 %package       cf
 Summary:       Sendmail configuration files and m4 macros
 Summary(pl):   Pliki konfiguracyjne oraz makra m4 dla sendmaila
 Group:         Daemons
-Group(pl):     Demony
+Group(pl):     Serwery
 Requires:      %{name} = %{version}
 
 %description cf
@@ -79,6 +82,7 @@ sy
 %patch5 -p1
 %patch6 -p1
 
+%build
 ID="`id -u`"
 GID="`id -g`"
 OPT=$RPM_OPT_FLAGS
@@ -86,26 +90,27 @@ OPT=$RPM_OPT_FLAGS
 cat %{SOURCE1} |sed s/gid/"$GID"/g | sort | sed s/id/"$ID"/g | sort | \
 sed s/opt/"$OPT"/g > BuildTools/Site/site.Linux.m4
 
-%build
 cd src
 ./makesendmail
 cd ../
-make makemap mail.local mailstats praliases rmail 
+make makemap mailstats praliases rmail 
 make smrsh LDOPTS="-s -static" 
 (
 cd cf/cf
-%{_bindir}/m4 pld.mc >> ./sendmail.cf
+/usr/bin/m4 pld.mc >> ./sendmail.cf
 )
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/{mail,rc.d/init.d}
-install -d $RPM_BUILD_ROOT/usr/{bin,sbin,lib/sendmail-cf,libexec}
-install -d $RPM_BUILD_ROOT%{_mandir}/man{1,5,8}
+install -d $RPM_BUILD_ROOT/etc/{mail,rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT%{_prefix}/{bin,lib,sbin,share/sendmail-cf,libexec}
+install -d $RPM_BUILD_ROOT%{_datadir}/{man/man{1,5,8},misc}
 install -d $RPM_BUILD_ROOT/var/{run,spool/{mqueue,mail}}
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/mail/aliases
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/sendmail
+
 touch $RPM_BUILD_ROOT/etc/mail/{sendmail.{ct,cw},relay-domains}
 
 for i in aliases access domaintable genericstable mailertable majordomo \
@@ -116,28 +121,33 @@ done
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/sendmail
 
 make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT OPTIONS=force-install rmail mail.local
+make DESTDIR=$RPM_BUILD_ROOT OPTIONS=force-install rmail 
 
 for i in hoststat mailq newaliases purgestat
-       do ln -sf ../sbin/sendmail  $RPM_BUILD_ROOT%{_bindir}/$i
+       do ln -sf ../sbin/sendmail  $RPM_BUILD_ROOT/usr/bin/$i
 done
-ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_libdir}/sendmail
+ln -sf ../sbin/sendmail $RPM_BUILD_ROOT%{_libdir}/sendmail
 
 install cf/cf/sendmail.cf $RPM_BUILD_ROOT/etc/mail
 
-cp cf/* $RPM_BUILD_ROOT%{_libdir}/sendmail-cf/ -a
+cp cf/* $RPM_BUILD_ROOT/usr/share/sendmail-cf/ -a
+
+mv $RPM_BUILD_ROOT/etc/mail/*.hf $RPM_BUILD_ROOT%{_datadir}/misc
 
 cp smrsh/README smrsh/SMRSH.txt
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/{man1/*,man5/*,man8/*}
-gzip -9nf README KNOWNBUGS RELEASE_NOTES smrsh/SMRSH.txt
+gzip -9fn $RPM_BUILD_ROOT/usr/share/man/man[158]/*
+gzip -9fn README KNOWNBUGS RELEASE_NOTES smrsh/SMRSH.txt
 
 %post
 /sbin/chkconfig --add sendmail
+if [ -f /var/lock/subsys/sendmail ]; then
+    /etc/rc.d/init.d/sendmail restart >&2
+fi
 
 %preun
 if [ -e /var/lock/sybsys/sendmail ]; then
-    /etc/rc.d/init.d/sendmail stop || :
+    /etc/rc.d/init.d/sendmail stop &>/dev/null
 fi
 
 if [ $1 = 0 ]; then
@@ -149,13 +159,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.gz KNOWNBUGS.gz RELEASE_NOTES.gz smrsh/SMRSH.txt.gz
+%doc {README,KNOWNBUGS,RELEASE_NOTES}.gz 
+%doc smrsh/SMRSH.txt.gz
 
-%attr(711,root,root) %{_bindir}/hoststat
-%attr(711,root,root) %{_bindir}/mailq
-%attr(711,root,root) %{_bindir}/newaliases
-%attr(711,root,root) %{_bindir}/purgestat
-%attr(755,root,root) %{_bindir}/rmail
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/mail/*
+%attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/*
+%attr(755,root,root) /etc/rc.d/init.d/*
+
+%attr(755,root,root) %{_bindir}/*
 
 %attr(755,root,root) %{_sbindir}/mailstats
 %attr(755,root,root) %{_sbindir}/makemap
@@ -163,40 +174,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(4711,root,root) %{_sbindir}/sendmail
 
-%attr(711,root,root) %{_libdir}/sendmail
-%attr(755,root,root) /usr/libexec/mail.local
-%attr(755,root,root) /usr/libexec/smrsh
+%attr(755,root,root) %{_libdir}/sendmail
+%attr(755,root,root) %{_sbindir}/smrsh
 
 %{_mandir}/man[158]/*
+%{_datadir}/misc/*.hf
 
-%attr(640,root,root) %config %verify(not size mtime md5) /var/run/sendmail.st
-
-%attr(750,root,mail) %dir /var/spool/mqueue
-
-%attr(700,root,root) %config %verify(not size mtime md5) /etc/rc.d/init.d/*
+%ghost /var/run/sendmail.st
 
 %files cf
 %defattr(644,root,root,755)
 
-%{_libdir}/sendmail-cf
-
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/mail/*
+%dir %{_datadir}/sendmail-cf
+%attr(-,root,root) %{_datadir}/sendmail-cf/*
 
 %changelog
-* Thu Feb 10 1999 Micha³ Kuratczyk <kurkens@polbox.com>
-  [8.9.2-3d]
-- "Obsoletes: smtpdaemon" instead a lot of obsoletes
-- simplification in %files
-- gzipping instead bzipping
-
 * Fri Jan 22 1999 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-[8.9.2-3d]
-- fixed group && owner ELF bineries,
+  [8.9.2-3d]
+- fixed group && owner ELF binaries,
 - fixed init script,
 - fixed %preun.
 
 * Sun Jan 17 1999 Wojtek ¦lusarczyk <wojtek@SHADOW.EU.ORG>
-[8.9.2-2d]
+  [8.9.2-2d]
 - fixed sendmail.init script,
 - compressed man pages && documentation,
   by Micha³ Zalewski <lcamtuf@ids.pl>
@@ -204,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 - added %{name}-redirect.patch
 
 * Thu Sep 10 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-[8.9.1-1d]
+  [8.9.1-1d]
 - updated to 8.9.1a && build for PLD Tornado,
 - build with IPv6 support
   (patches was prepared by John Kennedy <jk@csuchico.edu>),
@@ -212,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT
 - removed subpackage doc.
 
 * Thu Jul 30 1998 Wojtek Slusarczyk <wojtek@shadow.eu.org>
-[8.8.8-1d]
+  [8.8.8-1d]
 - build against glibc-2.1,
 - updated to 8.8.8,
 - added IPv6 support,
@@ -221,65 +221,3 @@ rm -rf $RPM_BUILD_ROOT
 - changed permissions of all binaries to 711,
 - moved %changelog at the end of spec,
 - build from non root's account.
-
-* Tue May 05 1998 Prospector System <bugs@redhat.com>
-
-- translations modified for de, fr, tr
-
-* Sat May 02 1998 Cristian Gafton <gafton@redhat.com>
-- enhanced initscripts
-
-* Fri May 01 1998 Cristian Gafton <gafton@redhat.com>
-- added a rmail patch
-
-* Wed Oct 29 1997 Donnie Barnes <djb@redhat.com>
-- argh!  Fixed some of the db1 handling that had to be added for glibc 2.1
-
-* Fri Oct 24 1997 Donnie Barnes <djb@redhat.com>
-- added support for db1 on SPARC
-
-* Thu Oct 16 1997 Donnie Barnes <djb@redhat.com>
-- added chkconfig support
-- various spec file cleanups
-- changed group to Networking/Daemons (from Daemons).  Sure, it runs on
-  non networked systems, but who really *needs* it then?
-
-* Wed Oct 08 1997 Donnie Barnes <djb@redhat.com>
-- made /etc/mail/deny.db a ghost
-- removed preun that used to remove deny.db (ghost handles that now)
-- NOTE: upgrading from the sendmail packages in 4.8, 4.8.1, and possibly
-  4.9 (all Red Hat betas between 4.2 and 5.0) could cause problems.  You
-  may need to do a makemap in /etc/mail and a newaliases after upgrading
-  from those packages.  Upgrading from 4.2 or prior should be fine.
-
-* Mon Oct 06 1997 Erik Troan <ewt@redhat.com>
-- made aliases.db a ghost
-
-* Tue Sep 23 1997 Donnie Barnes <djb@redhat.com>
-- fixed preuninstall script to handle aliases.db on upgrades properly
-
-* Mon Sep 15 1997 Donnie Barnes <djb@redhat.com>
-- fixed post-install output and changed /var/spool/mqueue to 755
-
-* Thu Sep 11 1997 Donnie Barnes <djb@redhat.com>
-- fixed /usr/lib/sendmail-cf paths
-
-* Tue Sep 09 1997 Donnie Barnes <djb@redhat.com>
-- updated to 8.8.7
-- added some spam filtration
-- combined some makefile patches
-- added BuildRoot support
-
-* Wed Sep 03 1997 Erik Troan <ewt@redhat.com>
-- marked initscript symlinks as missingok
-- run newalises after creating /var/spool/mqueue
-
-* Thu Jun 12 1997 Erik Troan <ewt@redhat.com>
-- built against glibc, udated release to -6 (skipped -5!)
-
-* Tue Apr 01 1997 Erik Troan <ewt@redhat.com>
-- Added -nsl on the Alpha (for glibc to provide NIS functions).
-
-* Mon Mar 03 1997 Erik Troan <ewt@redhat.com>
-- Added nis support.
-