OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Dec-2004 16:58:06
Branch: HEAD Handle: 2004122715580500
Modified files:
openpkg-src/amavisd amavisd.spec
Log:
integrate path corrections and config file substitutions by Bill
CAMPBELL
Summary:
Revision Changes Path
1.49 +6 -2 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 23 Dec 2004 12:30:35 -0000 1.48
+++ openpkg-src/amavisd/amavisd.spec 27 Dec 2004 15:58:05 -0000 1.49
@@ -34,7 +34,7 @@
Group: Mail
License: GPL
Version: 2.2.1
-Release: 20041223
+Release: 20041227
# package options
%option with_milter no
@@ -91,7 +91,7 @@
-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 @@
$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 @@
'%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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
