rpms/clamav/devel clamav.spec,1.68,1.69

Enrico Scholz (ensc) fedora-extras-commits at redhat.com
Wed Mar 12 08:38:45 UTC 2008


Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27536

Modified Files:
	clamav.spec 
Log Message:
- moved -milter scriptlets into -milter-core subpackage
- added a requirement on the milteruser to the -milter-sendmail
  subpackage (reported by Bruce Jerrick)



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- clamav.spec	5 Mar 2008 07:30:58 -0000	1.68
+++ clamav.spec	12 Mar 2008 08:38:02 -0000	1.69
@@ -21,7 +21,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.93
-Release:	%release_func 0.0%{?snapshot:.%snapshot}
+Release:	%release_func 0.1%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -146,6 +146,8 @@
 Source300:	README.fedora
 Requires:	sendmail
 Requires:	clamav-milter-core = %version-%release
+Requires(pre):	user(%milteruser)
+Requires(pre):	group(%milteruser)
 Provides:	milter(clamav) = sendmail
 Conflicts:	milter(clamav) < sendmail
 Conflicts:	milter(clamav) > sendmail
@@ -410,19 +412,19 @@
 	%__chown root:%username %freshclamlog
 }
 
-%pre milter
+%pre milter-core
 %__fe_groupadd 5 -r %milteruser &>/dev/null || :
 %__fe_useradd  5 -r -s /sbin/nologin -d %milterstatedir -M \
                  -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || :
 
-%post milter
+%post milter-core
 test -e %milterlog || {
 	touch %milterlog
 	chmod 0620             %milterlog
 	chown root:%milteruser %milterlog
 }
 
-%postun milter
+%postun milter-core
 %__fe_userdel  %milteruser &>/dev/null || :
 %__fe_groupdel %milteruser &>/dev/null || :
 
@@ -553,6 +555,11 @@
 
 
 %changelog
+* Wed Mar 12 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+- moved -milter scriptlets into -milter-core subpackage
+- added a requirement on the milteruser to the -milter-sendmail
+  subpackage (reported by Bruce Jerrick)
+
 * Tue Mar  4 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.93-0.0.rc1
 - updated to 0.93rc1
 - fixed rpath issues




More information about the fedora-extras-commits mailing list