[packages/rpm-build-macros] upstart macros: multiline safety fixes

[glen]

commit cefd17ae195d5886c54b04ada5342a5474229330
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 2 09:35:32 2014 +0000

    upstart macros: multiline safety fixes

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index b1230ab..c2e37ae 100644
--- 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 b7370d9..d892bbb 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/cefd17ae195d5886c54b04ada5342a5474229330