SPECS: frox.spec - fix uid/gid migration

[glen]

Author: glen                         Date: Mon Feb 27 23:19:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix uid/gid migration

---- Files affected:
SPECS:
   frox.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/frox.spec
diff -u SPECS/frox.spec:1.46 SPECS/frox.spec:1.47
--- SPECS/frox.spec:1.46	Sat Aug  6 18:28:47 2005
+++ SPECS/frox.spec	Tue Feb 28 00:19:45 2006
@@ -89,19 +89,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%groupadd -g 103 frox
-# TODO: should be in trigger
 if [ "`/usr/bin/getgid frox`" = 97 ]; then
 	/usr/sbin/groupmod -g 103 frox
 fi
+%groupadd -g 103 frox
 
-%useradd -u 103 -s /bin/false -g frox -c "FROX ftp caching daemon" -d /var/cache/frox frox
-# FIXME: should be in trigger
-if [ "`/bin/id -u frox`" = 97 ]; then
+if [ -n "`id -u frox 2>/dev/null`" ] && [ "`/bin/id -u frox`" = 97 ]; then
 	/usr/sbin/usermod -u 103 frox
 	chown -R frox:frox /var/cache/frox ||:
 	chown -R root:frox /var/log/frox /var/log/archiv/frox ||:
 fi
+%useradd -u 103 -s /bin/false -g frox -c "FROX ftp caching daemon" -d /var/cache/frox frox
 
 %post
 /sbin/chkconfig --add frox
@@ -145,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2006/02/27 23:19:45  glen
+- fix uid/gid migration
+
 Revision 1.46  2005/08/06 16:28:47  dzeus
 - up to 0.7.18, added ChangeLog in doc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/frox.spec?r1=1.46&r2=1.47&f=u