- one more update

[packages/sendmail.git] / sendmail.spec

diff --git a/sendmail.spec b/sendmail.spec
index cc5038132a23a1d3b9355072768735c5c74a18d5..6e9435fed1479c83a0226bacf8ae907b0f3f663f 100644 (file)
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -5,11 +5,11 @@
 Summary:       A widely used Mail Transport Agent (MTA)
 Summary(de):   sendmail-Mail-Übertragungsagent
 Summary(fr):   Agent de transport de courrier sendmail
-Summary(pl):   Sendmail -- aplikacja do obs³ugi poczty elektronicznej
+Summary(pl):   Sendmail - serwer poczty elektronicznej
 Summary(tr):   Elektronik posta hizmetleri sunucusu
 Name:          sendmail
-Version:       8.11.4
-Release:       5
+Version:       8.12.0
+Release:       1
 License:       BSD
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -24,34 +24,35 @@ Source5:    %{name}-etc-mail-Makefile
 Source6:       %{name}.mc
 Source7:       %{name}-config.m4
 Source8:       %{name}.sasl
-Patch0:                %{name}-redhat.patch
+Patch0:                %{name}-makefile.patch
+#Patch0:               %{name}-redhat.patch
 Patch1:                %{name}-makemapman.patch
 Patch2:                %{name}-smrsh-paths.patch
 Patch3:                %{name}-rmail.patch
-Patch4:                %{name}-manpath.patch
+Patch4:                %{name}-os-paths.patch
 Patch5:                %{name}-m4path.patch
 Patch6:                %{name}-dtelnet.patch
 Patch7:                %{name}-pld.mc.patch
 Patch8:                %{name}-redirect.patch
 Patch9:                %{name}-hprescan-dos.patch
-Patch10:       %{name}-aliasesDoS.patch
-Patch11:       %{name}-fix.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db3-devel
 %{!?_without_ldap:BuildRequires:       openldap-devel}
 BuildRequires: pam-devel
 Requires:      m4
-Prereq:                /sbin/chkconfig
+Prereq:                chkconfig
 Provides:      smtpdaemon
 Obsoletes:     smtpdaemon
-Obsoletes:     zmailer
-Obsoletes:     qmail
-Obsoletes:     smail
 Obsoletes:     exim
+Obsoletes:     masqmail
 Obsoletes:     postfix
+Obsoletes:     qmail
 Obsoletes:     sendmail-cf
 Obsoletes:     sendmail-doc
+Obsoletes:     smail
+Obsoletes:     zmailer
+Obsoletes:     omta
 
 %define                _sysconfdir     /etc/mail
 
@@ -96,14 +97,12 @@ istiyorsan
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 # seems to be obsoleted...
 #tar xf %{SOURCE2} -C cf
@@ -127,13 +126,13 @@ RPM_OPT_FLAGS="%{rpmcflags} \
 export RPM_OPT_FLAGS
 
 cd sendmail    && sh Build -f ../config.m4
-cd ../mailstats        && sh Build -f ../config.m4
-cd ../rmail    && sh Build -f ../config.m4
-cd ../makemap  && sh Build -f ../config.m4
-cd ../praliases        && sh Build -f ../config.m4
-cd ../smrsh    && sh Build -f ../config.m4
-cd ../cf/cf
-m4 redhat.mc > redhat.cf
+#cd ../mailstats       && sh Build -f ../config.m4
+#cd ../rmail   && sh Build -f ../config.m4
+#cd ../makemap && sh Build -f ../config.m4
+#cd ../praliases       && sh Build -f ../config.m4
+#cd ../smrsh   && sh Build -f ../config.m4
+#cd ../cf/cf
+#m4 redhat.mc > redhat.cf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -148,7 +147,9 @@ OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 IDNU=`id -nu`
 IDNG=`id -ng`
 SMINSTOPT="DESTDIR=$RPM_BUILD_ROOT SBINOWN=$IDNU SBINGRP=$IDNG \
-       UBINOWN=$IDNU UBINGRP=$IDNG MANOWN=$IDNU MANGRP=$IDNG"
+       UBINOWN=$IDNU UBINGRP=$IDNG MANOWN=$IDNU MANGRP=$IDNG \
+       CFOWN=$IDNU CFGRP=$IDNG MSPQOWN=$IDNU GBINGRP=$IDNG \
+       BINOWN=$IDNU BINGRP=$IDNG"
 %{__make} $SMINSTOPT install -C $OBJDIR/sendmail
 %{__make} $SMINSTOPT install -C $OBJDIR/mailstats
 %{__make} $SMINSTOPT install -C $OBJDIR/praliases
@@ -160,8 +161,8 @@ ln -sf ../sbin/makemap $RPM_BUILD_ROOT%{_bindir}/makemap
 # install docs by hand
 install -d $RPM_BUILD_ROOT%{_docdir}/sendmail
 cp -ar FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc $RPM_BUILD_ROOT%{_docdir}/sendmail
-cp smrsh/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.smrsh
-cp cf/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.cf
+cp -f smrsh/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.smrsh
+cp -f cf/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.cf
 
 # install the cf files
 cd cf
@@ -207,11 +208,11 @@ $RPM_BUILD_ROOT%{_bindir}/makemap -C $RPM_BUILD_ROOT%{_sysconfdir}/sendmail.cf h
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sendmail
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sendmail
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/Makefile
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/sasl/sendmail
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/sasl/Sendmail.conf
 
-mv $RPM_BUILD_ROOT/usr/share/doc/sendmail/{FAQ,KNOWNBUGS,LICENSE,README,README.cf,doc/op/op.me} .
+mv -f $RPM_BUILD_ROOT/usr/share/doc/sendmail/{FAQ,KNOWNBUGS,LICENSE,README,README.cf,doc/op/op.me} .
 
-gzip -9nf FAQ KNOWNBUGS README README.cf op.me
+gzip -9nf FAQ KNOWNBUGS README README.cf op.me RELEASE_NOTES
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,10 +257,20 @@ fi
  done
 } > /dev/null 2>&1
 
-DESC="sendmail daemon"; %chkconfig_add
+/sbin/chkconfig --add sendmail
+if [ -f /var/lock/subsys/sendmail ]; then
+       /etc/rc.d/init.d/sendmail restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/sendmail start\" to start sendmail daemon." >&2
+fi
 
 %preun
-%chkconfig_del
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/sendmail ]; then
+               /etc/rc.d/init.d/sendmail stop >&2
+       fi
+       /sbin/chkconfig --del sendmail
+fi
 
 # removal of compatibility links
 %triggerpostun -- sendmail < 8.10.1
@@ -314,7 +325,7 @@ DESC="sendmail daemon"; %chkconfig_add
 
 %attr(754,root,root) /etc/rc.d/init.d/sendmail
 %config(noreplace) /etc/sysconfig/sendmail
-%config(noreplace) /etc/sasl/sendmail
+%config(noreplace) /etc/sasl/Sendmail.conf
 
 %dir %{_libdir}/sendmail-cf
 %dir %{_libdir}/sendmail-cf/cf