From 0937d42efbca023da757879b834cad121e8e42dc Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Tue, 31 Dec 2002 09:32:32 +0000
Subject: [PATCH] - upgrade to pflogsumm 1.0.6 - add version tracking for
 pflogsumm - simplify packaging by removing unnecessary top-level directory -
 fix hard-core configuration part I

---
 postfix/postfix.spec | 61 ++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/postfix/postfix.spec b/postfix/postfix.spec
index 0b342e0db4..0c5b1c2c93 100644
--- a/postfix/postfix.spec
+++ b/postfix/postfix.spec
@@ -26,7 +26,7 @@
 #   package versions
 %define       V_postfix      2.0.0.1
 %define       V_tls          0.8.12-2.0.0.1-0.9.6h
-%define       V_pflogsumm    1.0.5
+%define       V_pflogsumm    1.0.6
 
 #   package options
 %option       with_tls       no
@@ -48,9 +48,9 @@ Release:      20021231
 #   list of sources
 Source0:      ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%{V_postfix}.tar.gz
 Source1:      ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-%{V_tls}.tar.gz
-Source2:      fsl.postfix
+Source2:      http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.tar.gz
 Source3:      etc.tar
-Source4:      http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.pl
+Source4:      fsl.postfix
 Source5:      rc.postfix
 
 #   build information
@@ -92,16 +92,16 @@ Conflicts:    sendmail, ssmtp, exim
 
 %prep
     #   unpack distribution files
-    %setup0 -q -c -a 0
+    %setup0 -q
 %if "%{with_tls}" == "yes"
     %setup1 -q -T -D -a 1
 %endif
+    %setup2 -q -T -D -a 2
     %setup3 -q -T -D -a 3
 
     #   apply external TLS patches
-    cd postfix-%{V_postfix}
 %if "%{with_tls}" == "yes"
-    %{l_patch} -p1 < ../pfixtls-%{V_tls}/pfixtls.diff
+    %{l_patch} -p1 <pfixtls-%{V_tls}/pfixtls.diff
 %endif
 
 %build
@@ -112,13 +112,12 @@ Conflicts:    sendmail, ssmtp, exim
     %{l_shtool} subst \
         -e 's;config_directory/postfix-script;command_directory/postfix-script;' \
         -e 's;config_directory/post-install;command_directory/postfix-install;' \
-        conf/postfix-script*
+        conf/postfix-script
     %{l_shtool} subst \
         -e 's;/usr/include;%{l_prefix}/include;g' \
         makedefs
 
     #   configure Postfix (regular part)
-    cd postfix-%{V_postfix}
     unset LD_LIBRARY_PATH || true
     CCARGS=""
     CCARGS="$CCARGS %{l_cflags -O}"
@@ -162,23 +161,22 @@ Conflicts:    sendmail, ssmtp, exim
     rm -rf $RPM_BUILD_ROOT
 
     #   perform standard installation procedure
-    ( cd postfix-%{V_postfix}
-      %{l_shtool} subst -e "s;chown;true;" postfix-install
-      sh postfix-install -non-interactive \
-          install_root=$RPM_BUILD_ROOT \
-          config_directory=%{l_prefix}/etc/postfix \
-          daemon_directory=%{l_prefix}/libexec/postfix \
-          command_directory=%{l_prefix}/sbin \
-          queue_directory=%{l_prefix}/var/postfix \
-          sendmail_path=%{l_prefix}/sbin/sendmail \
-          newaliases_path=%{l_prefix}/sbin/newaliases \
-          mailq_path=%{l_prefix}/sbin/mailq \
-          manpage_directory=%{l_prefix}/man \
-          mail_user=%{l_musr} \
-          setgid_group=%{l_rgrp}
-      %{l_shtool} install -c -m 755 \
-          -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
-          auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail )
+    %{l_shtool} subst -e "s;chown;true;" postfix-install
+    sh postfix-install -non-interactive \
+        install_root=$RPM_BUILD_ROOT \
+        config_directory=%{l_prefix}/etc/postfix \
+        daemon_directory=%{l_prefix}/libexec/postfix \
+        command_directory=%{l_prefix}/sbin \
+        queue_directory=%{l_prefix}/var/postfix \
+        sendmail_path=%{l_prefix}/sbin/sendmail \
+        newaliases_path=%{l_prefix}/sbin/newaliases \
+        mailq_path=%{l_prefix}/sbin/mailq \
+        manpage_directory=%{l_prefix}/man \
+        mail_user=%{l_musr} \
+        setgid_group=%{l_rgrp}
+    %{l_shtool} install -c -m 755 \
+        -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
+        auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
 
     #   post-adjust binaries
     rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/mailq
@@ -230,10 +228,12 @@ Conflicts:    sendmail, ssmtp, exim
       %{l_shtool} mkdir -f -p -m 755 log pid )
 
     #   install addons
-    %{l_shtool} install -c -m 755 \
-        -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
-        %{SOURCE pflogsumm-%{V_pflogsumm}.pl} \
-        $RPM_BUILD_ROOT%{l_prefix}/sbin/pflogsumm
+    ( cd pflogsumm-%{V_pflogsumm}
+      %{l_shtool} install -c -m 755 \
+          -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+          pflogsumm.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/pflogsumm
+      %{l_shtool} install -c -m 644 \
+          pflogsumm.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ )
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
@@ -255,8 +255,7 @@ Conflicts:    sendmail, ssmtp, exim
 
     #   adjust installation to avoid file name conflicts
     ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man8
-      mv master.8 postfix_master.8
-    )
+      mv master.8 postfix_master.8 )
 
     #   generate file list
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \