- reverting last change: removing new macros from %p{re,ost}{,un}

Changed files:
    frox.spec -> 1.8

diff --git a/frox.spec b/frox.spec
index 6286ed982612bdcca177139b4820d00eed7d81a6..69f56be2ff952d654f203b6edfbe83453eb41e26 100644 (file)
--- a/frox.spec
+++ b/frox.spec
@@ -49,19 +49,37 @@ install %{SOURCE2}  $RPM_BUILD_ROOT%{_sysconfdir}/frox.conf
 gzip -9nf doc/{FAQ,README.transdata,RELEASE,SECURITY,TODO}
 
 %pre
-GID=97; %groupadd
-UID=97; GROUP=squid; COMMENT="FROX ftp caching daemon"
-HOMEDIR=/var/cache/from; %useradd
+if [ ! -n "`getgid frox`" ]; then
+       /usr/sbin/groupadd -g 97 -r -f frox 1>&2 || :
+fi
+
+if [ ! -n "`id -u frox 2>/dev/null`" ]; then
+       /usr/sbin/useradd -M -o -r -u 97 -s /bin/false \
+               -g squid -c "FROX ftp caching daemon" -d /var/cache/frox frox 1>&2 || :
+fi             
 
 %post
-DESC="frox daemons"; %chkconfig_add
+/sbin/chkconfig --add frox
+if [ -f /var/lock/subsys/frox ]; then
+       /etc/rc.d/init.d/frox restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/frox start\" to start frox daemons."
+fi
 
 %postun
-%userdel
-%groupdel
+# If package is being erased for the last time.
+if [ "$1" = "0" ]; then
+       /usr/sbin/userdel frox 2> /dev/null
+       /usr/sbin/groupdel frox 2> /dev/null
+fi             
 
 %preun
-%chkconfig_del
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/frox ]; then
+               /etc/rc.d/init.d/frox stop >&2
+       fi
+       /sbin/chkconfig --del frox
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT