Author: jajcus Date: Tue May 11 15:59:04 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- %upstart_post and %upstart_postun added
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.559 -> 1.560)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.559
packages/rpm-build-macros/rpm.macros:1.560
--- packages/rpm-build-macros/rpm.macros:1.559 Thu Apr 29 14:52:00 2010
+++ packages/rpm-build-macros/rpm.macros Tue May 11 17:58:58 2010
@@ -1887,4 +1887,39 @@
/usr/share/cacti/cli/import_template.php --filename=%1 || :; \
}%{nil}
+# pre/post script for -upstart subpackages
+#
+# Author: Jacek Konieczny <[email protected]>
+#
+# 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
+%define 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
+%define 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.559&r2=1.560&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
