fix syntax under with_milter, switch with_milter from Sendmail to MILTER package, cleanup whole style of packaging

amavisd/amavisd.spec

@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Mail
 License:      GPL
 Version:      %{V_amavis}
-Release:      20061121
+Release:      20061230
 
 #   package options
 %option       with_milter no
@@ -56,8 +56,8 @@ PreReq:       OpenPKG, openpkg >= 20060823, spamassassin
 PreReq:       perl, perl-net, perl-util, perl-mail, perl-time
 PreReq:       perl-sys, perl-comp, perl-conv
 %if "%{with_milter}" == "yes"
-BuildPreReq:  sendmail, sendmail::with_milter = yes
-PreReq:       sendmail, sendmail::with_milter = yes
+BuildPreReq:  milter
+PreReq:       milter
 %endif
 AutoReq:      no
 AutoReqProv:  no
@@ -88,6 +88,7 @@ AutoReqProv:  no
     %patch -p0
 
 %build
+    #   adjust configuration file
     %{l_shtool} subst \
         -e "s;'clamscan';'%{l_prefix}/bin/clamscan';g" \
         -e "s;'uvscan';'%{l_prefix}/bin/uvscan';g" \
@@ -107,77 +108,76 @@ AutoReqProv:  no
         -e '/^\$MYHOME/s!$!\n$LOGFILE = "$MYHOME/amavisd.log";!' \
         -e 's;\(\$path *=.*\)/usr/local/sbin\(.*\);\1%{l_prefix}/sbin:%{l_prefix}/bin:/usr/local/sbin\2;' \
         amavisd.conf
+
+    #   adjust program
     %{l_shtool} subst \
         -e '1s;/usr/bin/perl;%{l_prefix}/bin/perl;' \
         -e 's;/var/amavis;%{l_prefix}/var/amavisd;g' \
         -e 's;/usr/lib/spamassassin;%{l_prefix}/lib/spamassassin;g' \
         amavisd
+
+    #   optionally build MILTER
 %if "%{with_milter}" == "yes"
-    cd helper-progs
-    CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O}" \
-    LDFLAGS="%{l_ldflags}" \
-    ./configure
-        --prefix="%{l_prefix}" \
-        --with-sendmail="%{l_prefix}/sbin/sendmail" \
-        --with-runtime-dir="%{l_prefix}/var/amavisd" \
-        --with-sockname="%{l_prefix}/var/amavisd/amavisd.sock" \
-        --with-user="%{l_rusr}" \
-        --with-milterinc="%{l_prefix}/include/libmilter" \
-        --with-milterlib="%{l_prefix}/lib"
+    ( cd helper-progs
+      CC="%{l_cc}" \
+      CFLAGS="%{l_cflags -O}" \
+      LDFLAGS="%{l_ldflags}" \
+      ./configure \
+          --prefix="%{l_prefix}" \
+          --with-sendmail="%{l_prefix}/sbin/sendmail" \
+          --with-runtime-dir="%{l_prefix}/var/amavisd" \
+          --with-sockname="%{l_prefix}/var/amavisd/amavisd.sock" \
+          --with-user="%{l_rusr}" \
+          --with-milterinc="%{l_prefix}/include/milter" \
+          --with-milterlib="%{l_prefix}/lib"
+      %{l_make} %{l_mflags}
+    ) || exit $?
 %endif
 
 %install
+    #   create installation hierarchy
     rm -rf $RPM_BUILD_ROOT
-
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
         $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd \
-        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests \
-        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/docs \
-        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/examples \
+        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/db \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/tmp \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/var \
         $RPM_BUILD_ROOT%{l_prefix}/var/amavisd/virusmails
 
+    #   install programs
+    %{l_shtool} install -c -m 755 \
+        amavisd $RPM_BUILD_ROOT%{l_prefix}/sbin/
     %{l_shtool} install -c -m 755 \
-        amavisd \
-        $RPM_BUILD_ROOT%{l_prefix}/sbin/
+        -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+        amavislogsumm $RPM_BUILD_ROOT%{l_prefix}/sbin/
+%if "%{with_milter}" == "yes"
+    %{l_shtool} install -c -s -m 755 \
+        helper-progs/amavis-milter $RPM_BUILD_ROOT%{l_prefix}/sbin/
+%endif
 
+    #   install default configuration
     %{l_shtool} install -c -m 644 \
-        amavisd.conf \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/
+        amavisd.conf $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/
 
+    #   install documentation
     %{l_shtool} install -c -m 644 \
-        test-messages/* \
-        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests/
-    %{l_shtool} install -c -m 644 \
-        RELEASE_NOTES README_FILES/* \
-        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/docs/
-    %{l_shtool} install -c -m 644 \
-        amavisd.conf-sample \
-        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/examples/
+        README_FILES/amavisd-new-docs.html \
+        $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/amavisd.html
 
+    #   install run-command script
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
-        %{SOURCE rc.amavisd} \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-
-    %{l_shtool} install -c -m 755 \
-        -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
-        amavislogsumm \
-        $RPM_BUILD_ROOT%{l_prefix}/sbin/amavislogsumm
+        %{SOURCE rc.amavisd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
         '%config %{l_prefix}/etc/amavisd/amavisd.conf' \
-        '%doc %{l_prefix}/share/amavisd/docs/*' \
+        '%doc %{l_prefix}/share/amavisd/*' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd' \
-        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/db' \
-        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/tmp' \
-        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/var' \
-        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/virusmails'
+        '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/*'
 
 %files -f files
 
@@ -192,11 +192,10 @@ AutoReqProv:  no
     exit 0
 
 %post
-    if [ $1 -eq 2 ]; then
-        #   after upgrade, restore status
-        eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
-        [ ".$amavisd_active" = .yes ] && %{l_rc} amavisd start
-    fi
+    [ $1 -eq 2 ] || exit 0
+    #   after upgrade, restore status
+    eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+    [ ".$amavisd_active" = .yes ] && %{l_rc} amavisd start
     exit 0
 
 %preun

amavisd/rc.amavisd

@@ -47,14 +47,10 @@
 
 %daily -u @l_rusr@
     rcService amavisd enable yes || exit 0
-
-    #   rotate summary logfile
     shtool rotate -f \
         -n ${amavisd_log_numfiles} -s 0 \
         -z ${amavisd_log_complevel} -m 640 \
         @l_prefix@/var/amavisd/amavisd.sum
-
-    #   generate summary logfile
     logfiles="@l_prefix@/var/amavisd/amavisd.log"
     if [ -f "@l_prefix@/var/amavisd/amavisd.log.0" ]; then
         logfiles="@l_prefix@/var/amavisd/amavisd.log.0 $logfiles"
@@ -62,8 +58,6 @@
     cat ${logfiles} | @l_prefix@/sbin/amavislogsumm \
         -d yesterday -R -B ${amavisd_sum_flags} \
         >@l_prefix@/var/amavisd/amavisd.sum 2>/dev/null
-
-    #   rotate logfile
     shtool rotate -f \
         -n ${amavisd_log_numfiles} -s ${amavisd_log_minsize} -d \
         -z ${amavisd_log_complevel} -m 640 \