SPECS: clamav.spec - revert 1.254: Upgrading... 1:clam...

[adamg]

Author: adamg                        Date: Wed Mar 25 20:42:35 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert 1.254:
  Upgrading...                
   1:clamav-libs            ########################################### [ 50%]
  Adding user clamav to group amavis
  usermod: `clamav' is primary group name.
  usermod: Unknown group `amavis'.
  error: %pre(clamav-0.95-0.1.i686) scriptlet failed, exit status 14
  error:   install: %pre scriptlet failed (2), skipping clamav-0.95-0.1

---- Files affected:
SPECS:
   clamav.spec (1.255 -> 1.256) 

---- Diffs:

================================================================
Index: SPECS/clamav.spec
diff -u SPECS/clamav.spec:1.255 SPECS/clamav.spec:1.256
--- SPECS/clamav.spec:1.255	Tue Mar 24 08:55:07 2009
+++ SPECS/clamav.spec	Wed Mar 25 21:42:30 2009
@@ -195,18 +195,39 @@
 rm -rf $RPM_BUILD_ROOT
 
 %triggerin -- amavis-ng
-%addusertogroup clamav amavis
+AMAVIS=$(/usr/bin/getgid amavis)
+RESULT=$?
+if [ $RESULT -eq 0 ]; then
+	echo "Adding clamav to amavis group GID=$AMAVIS"
+	/usr/sbin/usermod -G amavis clamav 1>&2 > /dev/null
+fi
 
 %triggerin -- amavisd-new
-%addusertogroup clamav amavis
+AMAVIS=$(/usr/bin/getgid amavis)
+RESULT=$?
+if [ $RESULT -eq 0 ]; then
+	echo "Adding clamav to amavis group GID=$AMAVIS"
+	/usr/sbin/usermod -G amavis clamav 1>&2 > /dev/null
+fi
 
 %triggerin -- amavisd
-%addusertogroup clamav amavis
+AMAVIS=$(/usr/bin/getgid amavis)
+RESULT=$?
+if [ $RESULT -eq 0 ]; then
+	echo "Adding clamav to amavis group GID=$AMAVIS"
+	/usr/sbin/usermod -G amavis clamav 1>&2
+fi
 
 %pre
 %groupadd -g 43 clamav
 %useradd -u 43 -d /tmp -s /bin/false -c "Clam Anti Virus Checker" -g clamav clamav
-%addusertogroup clamav amavis
+
+# FIXME: check this. is it proper after useradd macro?
+# TODO: use addusertogroup macro?
+if [ -n "`/usr/bin/getgid amavis`" ]; then
+	echo "Adding clamav to amavis group"
+	/usr/sbin/usermod -G amavis clamav 1>&2
+fi
 
 %post
 /sbin/chkconfig --add clamd
@@ -337,6 +358,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.256  2009/03/25 20:42:30  adamg
+- revert 1.254:
+  Upgrading...
+   1:clamav-libs            ########################################### [ 50%]
+  Adding user clamav to group amavis
+  usermod: `clamav' is primary group name.
+  usermod: Unknown group `amavis'.
+  error: %pre(clamav-0.95-0.1.i686) scriptlet failed, exit status 14
+  error:   install: %pre scriptlet failed (2), skipping clamav-0.95-0.1
+
 Revision 1.255  2009/03/24 07:55:07  adamg
 - updated to 0.95
 - -no_auto_libwrap and -valid_pp_exp patches seem obsolete
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/clamav.spec?r1=1.255&r2=1.256&f=u