SPECS: clamav.spec - dropped PreReq (use plain Requires for rc-scr...

[qboosh]

Author: qboosh                       Date: Wed Sep 14 08:25:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped PreReq (use plain Requires for rc-scripts), unified

---- Files affected:
SPECS:
   clamav.spec (1.171 -> 1.172) 

---- Diffs:

================================================================
Index: SPECS/clamav.spec
diff -u SPECS/clamav.spec:1.171 SPECS/clamav.spec:1.172
--- SPECS/clamav.spec:1.171	Fri Aug 26 13:46:10 2005
+++ SPECS/clamav.spec	Wed Sep 14 10:24:54 2005
@@ -46,8 +46,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.202
 %{?with_milter:BuildRequires:	sendmail-devel >= 8.11}
 BuildRequires:	zlib-devel
-PreReq:		rc-scripts
-Requires(pre):	%{__id}
+Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
@@ -59,6 +58,7 @@
 Requires:	/usr/sbin/usermod
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	bc
+Requires:	rc-scripts
 Provides:	group(clamav)
 Provides:	user(clamav)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -314,8 +314,8 @@
 %attr(750,clamav,clamav) %dir %{_var}/run/%{name}
 
 %attr(640,root,root) %{_sysconfdir}/cron.d/%{name}
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamd.conf
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/freshclam.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/freshclam.conf
 
 %attr(754,root,root) /etc/rc.d/init.d/clamd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clamd
@@ -333,7 +333,7 @@
 #%{_sysconfdir}/log.d/conf/services/clamav-milter.conf
 %attr(755,root,root) %{_sbindir}/clamav-milter
 %{_mandir}/man8/clamav-milter.8*
-%attr(700,clamav,clamav) /var/spool/clamav/
+%attr(700,clamav,clamav) /var/spool/clamav
 %endif
 
 %files libs
@@ -365,6 +365,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172  2005/09/14 08:24:54  qboosh
+- dropped PreReq (use plain Requires for rc-scripts), unified
+
 Revision 1.171  2005/08/26 11:46:10  qboosh
 - triggerpostun dep really differs from postun dep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.171&r2=1.172&f=u