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

Changed files:
    netatalk.spec -> 1.4

diff --git a/netatalk.spec b/netatalk.spec
index 12c555b9fa1e6b69f6090e559b8ad5f5f0b502d2..79ef81e7c7c32c9562c3da098244a82c3c8edab7 100644 (file)
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -117,7 +117,8 @@ gzip -9nf BUGS CHANGES COPYRIGHT ChangeLog ICDu* \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
+/sbin/chkconfig --add atalk
+ldconfig
 # Do only for the first install
 if [ "$1" = 1 ] ; then
   # Add the ddp lines to /etc/services
@@ -145,11 +146,16 @@ afpovertcp        548/udp
 _EOD2_
   fi
 fi
-NAME=atalk; DESC=netatalk; %chkconfig_add
+    echo "Run \"/etc/rc.d/init.d/atalk start\" to start netatalk." >&2
        
 %preun
-NAME=atalk; %chkconfig_del
+if [ "$1" = "0" ]; then
+/etc/rc.d/init.d/atalk stop >&2
+fi
+
 if [ "$1" = "0" ] ; then
+  %{_initdir}/atalk stop > /dev/null 2>&1
+  /sbin/chkconfig --del atalk
   # remove the ddp lines from /etc/services
   if (grep '^# start of DDP services$' /etc/services >/dev/null && \
       grep '^# end of DDP services$' /etc/services >/dev/null ); then