rpms/postfix/F-7 postfix-etc-init.d-postfix, 1.9, 1.10 postfix.spec, 1.54, 1.55

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/postfix/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22001

Modified Files:
	postfix-etc-init.d-postfix postfix.spec 
Log Message:
[tw]
- more review fixes



Index: postfix-etc-init.d-postfix
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-7/postfix-etc-init.d-postfix,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- postfix-etc-init.d-postfix	11 Nov 2005 14:06:11 -0000	1.9
+++ postfix-etc-init.d-postfix	14 Jun 2007 10:23:08 -0000	1.10
@@ -2,7 +2,7 @@
 #
 # postfix      Postfix Mail Transfer Agent
 #
-# chkconfig: 2345 80 30
+# chkconfig: - 80 30
 # description: Postfix is a Mail Transport Agent, which is the program \
 #              that moves mail from one machine to another.
 # processname: master


Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-7/postfix.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- postfix.spec	14 Jun 2007 09:36:33 -0000	1.54
+++ postfix.spec	14 Jun 2007 10:23:08 -0000	1.55
@@ -8,11 +8,6 @@
 %define POSTDROP_GID 90
 %define PFLOGSUMM 1
 
-# On Redhat 8.0.1 and earlier, LDAP is compiled with SASL V1 and won't work
-# if postfix is compiled with SASL V2. So we drop to SASL V1 if LDAP is
-# requested but use the preferred SASL V2 if LDAP is not requested.
-# Sometime soon LDAP will build agains SASL V2 and this won't be needed.
-
 %if %{LDAP} == 1 && %{SASL} >= 2
 %undefine SASL
 %define SASL 1
@@ -44,16 +39,19 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.4.3
-Release: 2%{dist}
+Release: 2%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
 License: IBM Public License
-PreReq: /sbin/chkconfig, /sbin/service, sh-utils
-PreReq: fileutils, textutils,
-PreReq: /usr/sbin/alternatives
-
-PreReq: %{_sbindir}/groupadd, %{_sbindir}/useradd
+Requires(post): /sbin/chkconfig
+Requires(post): %{_sbindir}/alternatives
+Requires(pre): %{_sbindir}/groupadd
+Requires(pre): %{_sbindir}/useradd
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(preun): %{_sbindir}/alternatives
+Requires(postun): /sbin/service
 
 Provides: MTA smtpd smtpdaemon /usr/bin/newaliases
 
@@ -85,10 +83,10 @@
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
 
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Determine the different packages required for building postfix
-BuildRequires: perl, db4-devel, pkgconfig, zlib-devel
+BuildRequires: db4-devel, pkgconfig, zlib-devel
 
 Requires: setup >= 2.5.36-1
 BuildRequires: setup >= 2.5.36-1
@@ -130,8 +128,6 @@
 TLS
 
 %prep
-umask 022
-
 %setup -q
 # Apply obligatory patches
 %patch1 -p1 -b .config
@@ -153,7 +149,7 @@
 %package pflogsumm
 Group: System Environment/Daemons
 Summary: A Log Summarizer/Analyzer for the Postfix MTA
-Requires: perl-Date-Calc
+Requires: postfix = %{version}-%{release}
 %description pflogsumm
 Pflogsumm is a log analyzer/summarizer for the Postfix MTA.  It is
 designed to provide an over-view of Postfix activity. Pflogsumm
@@ -164,8 +160,6 @@
 %endif
 
 %build
-umask 022
-
 CCARGS=-fPIC
 AUXLIBS=
 
@@ -222,10 +216,9 @@
 make -f Makefile.init makefiles
 
 unset CCARGS AUXLIBS
-make DEBUG="" OPT="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} DEBUG="" OPT="$RPM_OPT_FLAGS"
 
 %install
-umask 022
 /bin/rm -rf   $RPM_BUILD_ROOT
 /bin/mkdir -p $RPM_BUILD_ROOT
 
@@ -315,8 +308,6 @@
 popd
 
 %post
-umask 022
-
 /sbin/chkconfig --add postfix
 
 # upgrade configuration files if necessary
@@ -351,13 +342,11 @@
 exit 0
 
 %preun
-umask 022
-
 if [ "$1" = 0 ]; then
     # stop postfix silently, but only if it's running
     /sbin/service postfix stop &>/dev/null
     /sbin/chkconfig --del postfix
-    /usr/sbin/alternatives --remove mta %{postfix_command_dir}/sendmail.postfix
+    %{_sbindir}/alternatives --remove mta %{postfix_command_dir}/sendmail.postfix
 fi
 
 exit 0
@@ -390,7 +379,7 @@
 %config(noreplace) %{sasl_v2_lib_dir}/smtpd.conf
 %endif
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.postfix
-%attr(0755, root, root) %config /etc/rc.d/init.d/postfix
+%attr(0755, root, root) /etc/rc.d/init.d/postfix
 
 # Misc files