SPECS: smokeping.spec - moved %addusertogroup from %post to %pre, added mis...

[gotar]

Author: gotar                        Date: Mon Feb 16 11:50:17 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved %addusertogroup from %post to %pre, added missing R(*)

---- Files affected:
SPECS:
   smokeping.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/smokeping.spec
diff -u SPECS/smokeping.spec:1.63 SPECS/smokeping.spec:1.64
--- SPECS/smokeping.spec:1.63	Mon Feb 16 10:15:05 2009
+++ SPECS/smokeping.spec	Mon Feb 16 12:50:11 2009
@@ -23,7 +23,15 @@
 BuildRequires:	sed >= 4.0
 Requires(post):	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
-Requires(post):	findutils
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/lib/rpm/user_group.sh
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires(pre):	/usr/sbin/usermod
+Requires(triggerpostun):	findutils
 Requires:	rc-scripts
 Requires:	rrdtool >= 1.2
 Suggests:	fping
@@ -92,7 +100,7 @@
 # rrdtool package goes into standard perl tree
 decruft '^use lib .*rrdtool.*;' ''
 
-decruft /usr/bin/speedy-5.8.8 /usr/bin/speedy
+decruft /usr/bin/speedy-5.8.8 %{_bindir}/speedy
 
 sed -i -e '/\/home\/oposs\/smokeping\/software\/lib/d' htdocs/tr.cgi.dist
 sed -i -e '/\/home\/oetiker\/checkouts\/smokeping\/trunk\/software\/lib/d' htdocs/smokeping.cgi.dist
@@ -141,10 +149,10 @@
 %pre
 %groupadd -g 207 %{name}
 %useradd -u 207 -d /var/lib/%{name} -g %{name} -s /bin/false -c "Smokeping User" %{name}
+%addusertogroup smokeping adm
 
 %post
 /sbin/chkconfig --add %{name}
-%addusertogroup smokeping adm
 
 %preun
 if [ "$1" = 0 ]; then
@@ -244,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2009/02/16 11:50:11  gotar
+- moved %addusertogroup from %post to %pre, added missing R(*)
+
 Revision 1.63  2009/02/16 09:15:05  blues
 - use proper macro for adding user to group, no banner
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/smokeping.spec?r1=1.63&r2=1.64&f=u