- to much copied from the spec. no %define here

Changed files:
    rpm.macros -> 1.561

diff --git a/rpm.macros b/rpm.macros
index dd3a397ecec93362e746d3a24e021970847d68fc..94da187f547199a1812498ec569cb95b691ac2de 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1907,7 +1907,7 @@ else: \
 # Requires:                    rc-scripts >= 0.4.3
 
 # migrate from init script to upstart job
-%define        upstart_post() \
+%upstart_post() \
        if [ -f /var/lock/subsys/"%1" ] ; then \
                /sbin/service --no-upstart "%1" stop \
                /sbin/service "%1" start \
@@ -1916,7 +1916,7 @@ else: \
 # restart the job after upgrade or migrate to init script on removal
 # cannot be stopped with 'service' as /etc/init/$name.conf may be missing
 # at this point
-%define        upstart_postun() \
+%upstart_postun() \
        if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
                /sbin/initctl stop "%1" >/dev/null 2>&1 \
                [ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && { echo -n "Re-" ; /sbin/service "%1" start ; } ; \