- use macros in %{pre,post}{,un}

- need rebuilt rpm (with new macros.pld) to build these

Changed files:
    courier-imap.spec -> 1.26

diff --git a/courier-imap.spec b/courier-imap.spec
index 5da4b0fc5bc6c64fc4b90e29bc6701bc643d27a8..50293aa65ac657500338f14f5afbb29e8874dd4b 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -121,56 +121,22 @@ gzip -9nf README* imap/BUGS AUTHORS COPYING
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
 %post
-/sbin/chkconfig --add courier-imap
-
-if [ -f /var/lock/subsys/courier-imap ]; then
-       /etc/rc.d/init.d/courier-imap restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/courier-imap start\" to start courier-imap daemon."
-fi
+DESC="%{name} daemon"; %chkconfig_add
 
 %preun
-if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/courier-imap ]; then
-               /etc/rc.d/init.d/courier-imap stop >&2
-       fi
-       /sbin/chkconfig --del courier-imap
-fi
+%chkconfig_del
 
 %post common
-/sbin/chkconfig --add authdaemon
-
-if [ -f /var/lock/subsys/authdaemon ]; then
-       /etc/rc.d/init.d/authdaemon restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/authdaemon start\" to start courier-imap authdaemon."
-fi
+NAME=authdaemon; DESC="%{name} authdaemon"; %chkconfig_add
 
 %preun common
-if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/authdaemon ]; then
-               /etc/rc.d/init.d/authdaemon stop >&2
-       fi
-
-       /sbin/chkconfig --del authdaemon
-fi
+NAME=authdaemon; %chkconfig_del
 
 %post pop3
-/sbin/chkconfig --add courier-imap-pop3
-
-if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
-       /etc/rc.d/init.d/courier-imap-pop3 restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/courier-imap-pop3 start\" to start courier-imap pop3 daemon."
-fi
+NAME=%{name}-pop3; DESC="%{name} pop3 daemon; %chkconfig_add
 
 %preun pop3
-if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
-               /etc/rc.d/init.d/courier-imap-pop3 stop >&2
-       fi
-       /sbin/chkconfig --del courier-imap
-fi
+NAME=%{name}-pop3; %chkconfig_del
 
 %clean
 rm -rf $RPM_BUILD_ROOT