rpms/clamav/EL-4 clamav.spec,1.30,1.31

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/clamav/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25993/EL-4

Modified Files:
	clamav.spec 
Log Message:

EL-4 fixes



Index: clamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clamav/EL-4/clamav.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- clamav.spec	21 Dec 2007 19:23:13 -0000	1.30
+++ clamav.spec	21 Dec 2007 19:42:42 -0000	1.31
@@ -58,8 +58,7 @@
 # Prevent version mix
 Conflicts:	%name < %version-%release
 Conflicts:	%name > %version-%release
-BuildRequires:	fedora-usermgmt-devel
-%{?FE_USERADD_REQ}
+Requires(pre):	shadow-utils
 
 %package lib
 Summary:	Dynamic libraries for the Clam Antivirus scanner
@@ -123,12 +122,11 @@
 Group:		System Environment/Daemons
 Requires:	init(clamav-milter)
 BuildRequires:	sendmail-devel
-BuildRequires:	fedora-usermgmt-devel
 Provides:	user(%milteruser)
 Provides:	group(%milteruser)
 Requires:	sendmail
 Requires(post):	coreutils
-%{?FE_USERADD_REQ}
+Requires(pre):	shadow-utils
 
 %package milter-sysv
 Summary:	SysV initscripts for the clamav sendmail-milter
@@ -360,14 +358,11 @@
 ## ------------------------------------------------------------
 
 %pre filesystem
-%__fe_groupadd 4 -r %username &>/dev/null || :
-%__fe_useradd  4 -r -s /sbin/nologin -d %homedir -M          \
-                 -c 'Clamav database update user' -g %username %username &>/dev/null || :
-
-%postun filesystem
-%__fe_userdel  %username &>/dev/null || :
-%__fe_groupdel %username &>/dev/null || :
-
+getent group %username >/dev/null || groupadd -r %username
+getent passwd %username >/dev/null || \
+useradd -r -g %username -d %homedir -s /sbin/nologin \
+    -c "Clamav databse update user" %username
+exit 0
 
 %post update
 test -e %freshclamlog || {
@@ -377,9 +372,11 @@
 }
 
 %pre milter
-%__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 || :
+getent group %milteruser >/dev/null || groupadd -r %milteruser
+getent passwd %milteruser >/dev/null || \
+useradd -r -g %milteruser -d %milterstatedir -s /sbin/nologin \
+    -c "Clamav Milter user" %milteruser
+exit 0
 
 %post milter
 test -e %milterlog || {
@@ -388,11 +385,6 @@
 	chown root:%milteruser %milterlog
 }
 
-%postun milter
-%__fe_userdel  %milteruser &>/dev/null || :
-%__fe_groupdel %milteruser &>/dev/null || :
-
-
 %post milter-sysv
 /sbin/chkconfig --add clamav-milter
 
@@ -519,6 +511,9 @@
 
 
 %changelog
+* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.92-4.2
+- EL-4 not using fedora-account style due to missing deps
+
 * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.92-4
 - EPEL fixes