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

Changed files:
    arpd.spec -> 1.12

diff --git a/arpd.spec b/arpd.spec
index 26ade52b1146cb29f513d114c24a0efe09e3b296..71b3e8aeb6252db72721f73c969cede10149ddd2 100644 (file)
--- a/arpd.spec
+++ b/arpd.spec
@@ -60,10 +60,18 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpd
 gzip -9nf CHANGES
 
 %pre
-USER=arpd; UID=40; HOMEDIR=/var/lib/arpd; COMMENT="arpd user"
-GROUP=daemon; %useradd
+if [ -n "`id -u arpd 2>/dev/null`" ]; then
+       if [ "`id -u arpd`" != "40" ]; then
+               echo "Warning: user arpd haven't uid=40. Correct this before installing arpd." 1>&2
+               exit 1
+       fi
+else
+       echo "Adding arpd user (UID=40)"
+       /usr/sbin/useradd -u 40 -r -d /var/lib/arpd -s /bin/false -c "arpd user" -g daemon arpd 1>&2
+fi
 
 %post
+/sbin/chkconfig --add arpd
 if [ ! -L /dev/arpd ]; then
        echo "Moving /dev/arpd to /var/lib/arpd/arpd and making symlink"
        mv -f /dev/arpd /var/lib/arpd
@@ -71,11 +79,20 @@ if [ ! -L /dev/arpd ]; then
        ln -s /var/lib/arpd/arpd dev/arpd
 fi
 echo "You need arpd kernel support. The standard kernels of PLD lack this support!!"
-DESC="arpd daemon"; %chkconfig_add
+if [ -f /var/lock/subsys/arpd ]; then
+       /etc/rc.d/init.d/arpd restart 1>&2
+else
+       echo "Run \"/etc/rc.d/init.d/arpd start\" to start arpd daemon."
+fi
+
 
 %preun
-%chkconfig_del
+/sbin/chkconfig --del arpd
 if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/arpd ]; then
+               /etc/rc.d/init.d/arpd stop 1>&2
+       fi
+       /sbin/chkconfig --del arpd
        echo "Moving /var/lib/arpd/arpd to /dev/arpd and removing symlink"
        rm -f /dev/arpd
        mv -f /var/lib/arpd/arpd /dev/arpd
@@ -83,7 +100,10 @@ if [ "$1" = "0" ]; then
 fi
 
 %postun
-USER=arpd; %userdel
+if [ "$1" = "0" ]; then
+       echo "Removing arpd user (UID=40)"
+       /usr/sbin/userdel arpd
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT