X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=blobdiff_plain;f=rpm.macros;h=000e83fe697aaf348cbfee749b79d60150d18e17;hp=fc8fa1019e985ce42de5312854849c0e8de36e3a;hb=5ad4663a611b782181b0d38979be572a369ee49f;hpb=90c674d31b62f12a4e46fcaedfff5011e0c460e6

diff --git a/rpm.macros b/rpm.macros
index fc8fa10..000e83f 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1377,7 +1377,7 @@ echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 %__pear_install_log \
 tee install.log \
 # make post message of optional packages \
-grep 'can optionally use' install.log | sed -e 's,package "pear/,package "php-pear-,g;s,^pear/,php-pear-,;s,^pear/,php-pear-,;s,^channel://.*/,,' > optional-packages.txt \
+grep -E 'can optionally use|Optional feature' install.log | sed -e 's,package "pear/,package "php-pear-,g;s,^pear/,php-pear-,;s,^pear/,php-pear-,;s,^channel://.*/,,' > optional-packages.txt \
 if [ -s optional-packages.txt ]; then \
 	awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
 else \
@@ -1849,7 +1849,8 @@ else: \
 # %nagios_nrpe -d %{plugin} -f %{_sysconfdir}/%{plugin}.cfg
 #
 # Requirements:
-# BuildRequires:	sed >= 4.0
+# Requires:			grep
+# Requires:			sed >= 4.0
 # BuildRequires:	rpmbuild(macros) >= 1.552
 %nagios_nrpe(a:d:c:f:) {\
 	m=$(md5sum < /etc/nagios/nrpe.cfg); \
@@ -1887,4 +1888,39 @@ else: \
 /usr/share/cacti/cli/import_template.php --filename=%1 || :; \
 }%{nil}
 
+# pre/post script for -upstart subpackages
+#
+# Author: Jacek Konieczny <jajcus@jajcus.net>
+#
+# Usage:
+#	%upstart_post service_name
+#   %upstart_postun service_name
+#
+# Sample:
+# %post upstart
+# %upstart_post %{name}
+#
+# %postun upstart
+# %upstart_postun %{name}
+#
+# Requirements:
+# BuildRequires:	rpmbuild(macros) >= 1.560
+# Requires:			rc-scripts >= 0.4.3
+
+# migrate from init script to upstart job
+%upstart_post() \
+	if [ -f /var/lock/subsys/"%1" ] ; then \
+		/sbin/service --no-upstart "%1" stop \
+		/sbin/service "%1" start \
+	fi
+
+# 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
+%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 ; } ; \
+	fi
+
 # vim:ts=4 sw=4 noet ft=spec