packages: rpm-build-macros/rpm.macros - to much copied from the spec. no %d...

[jajcus]

Author: jajcus                       Date: Tue May 11 16:36:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- to much copied from the spec. no %define here

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.560 -> 1.561) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.560 packages/rpm-build-macros/rpm.macros:1.561
--- packages/rpm-build-macros/rpm.macros:1.560	Tue May 11 17:58:58 2010
+++ packages/rpm-build-macros/rpm.macros	Tue May 11 18:36:49 2010
@@ -1907,7 +1907,7 @@
 # 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 @@
 # 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 ; } ; \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.560&r2=1.561&f=u