[clamav/el6] Make substitutions a little more explicit.

Jan-Frode Myklebust janfrode at fedoraproject.org
Thu Aug 4 08:14:43 UTC 2011


commit 96fb7210c39ec20d51155510e7e2565c62178638
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Thu Aug 4 10:14:11 2011 +0200

    Make substitutions a little more explicit.

 clamav.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index b4cde09..5ca4752 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -5,7 +5,7 @@
 Summary: Anti-virus software
 Name: clamav
 Version: 0.97.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://www.clamav.net/
@@ -166,8 +166,8 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -)
 %{__perl} -pi.orig -e '
 		s|^(Example)|#$1|;
 		s|^#(User) .+$|$1 clam|;
-		s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|;
-		s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|;
+		s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|;
+		s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|;
 		s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|;
 	' etc/clamav-milter.conf
 
@@ -409,7 +409,7 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/libclamav.la
 
 %changelog
-* Thu Aug  4 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-4
+* Thu Aug  4 2011 Jan-Frode Myklebuust <janfrode at tanso.net> - 0.97.2-5
 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf.
   (bz#727894)
 


More information about the scm-commits mailing list