upstart macros: multiline safety fixes

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index b1230ab936c9589216d710730730f3d738f2b64b..c2e37ae9fb6670b322ee2b0fd891b6b4cda2e09a 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.688
+%define                rpm_macros_rev  1.689
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index b7370d9b5b6d4b301c69e0e32362cd0e334bbcb1..d892bbba2976483b2e3d42878c25a645f54116f5 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2273,7 +2273,7 @@ fi; \
 # %upstart_postun %{name}
 #
 # Requirements:
-# BuildRequires:       rpmbuild(macros) >= 1.560
+# BuildRequires:       rpmbuild(macros) >= 1.689
 # Requires:                    rc-scripts >= 0.4.3
 
 # migrate from init script to upstart job
@@ -2281,7 +2281,8 @@ fi; \
        if [ -f /var/lock/subsys/%1 ]; then \
                /sbin/service --no-upstart %1 stop \
                /sbin/service %1 start \
-       fi
+       fi \
+%{nil}
 
 # 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
@@ -2290,7 +2291,8 @@ fi; \
        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; }; \
-       fi
+       fi \
+%{nil}
 
 # Haskell Macros
 # BuildRequires:  rpmbuild(macros) >= 1.608