integrate path corrections and config file substitutions by Bill CAMPBELL

amavisd/amavisd.spec

@@ -34,7 +34,7 @@ Class:        PLUS
 Group:        Mail
 License:      GPL
 Version:      2.2.1
-Release:      20041223
+Release:      20041227
 
 #   package options
 %option       with_milter no
@@ -91,7 +91,7 @@ AutoReqProv:  no
         -e 's;\(daemon_user *= \)[^;]*;\1q{%{l_rusr}};' \
         -e 's;\(daemon_group *= \)[^;]*;\1q{%{l_rgrp}};' \
         -e 's;\(\$DO_SYSLOG *= \)[^;]*;\10;' \
-        -e 's;\(\$LOGFILE *=.*\)amavis.log\([^ \t]*\) \(.*\);\1amavisd.log\2\3;' \
+        -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
     %{l_shtool} subst \
@@ -126,6 +126,8 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests \
         $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
 
     %{l_shtool} install -c -m 755 \
@@ -156,6 +158,8 @@ AutoReqProv:  no
         '%config %{l_prefix}/etc/amavisd/amavisd.conf' \
         '%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'
 
 %files -f files