packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[baggins]

Author: baggins                      Date: Fri Feb 17 18:17:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.647
- added generic systemd_service macro and systemd_service_reload

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.323 -> 1.324) , rpm.macros (1.646 -> 1.647) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.323 packages/rpm-build-macros/rpm-build-macros.spec:1.324
--- packages/rpm-build-macros/rpm-build-macros.spec:1.323	Fri Feb 17 14:55:48 2012
+++ packages/rpm-build-macros/rpm-build-macros.spec	Fri Feb 17 19:17:29 2012
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.644
+%define		rpm_macros_rev	1.647
 %define		find_lang_rev	1.35
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -92,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.324  2012/02/17 18:17:29  baggins
+- 1.647
+- added generic systemd_service macro and systemd_service_reload
+
 Revision 1.323  2012/02/17 13:55:48  baggins
 - 1.644
 - add new and cleanup existing systemd macros

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.646 packages/rpm-build-macros/rpm.macros:1.647
--- packages/rpm-build-macros/rpm.macros:1.646	Fri Feb 17 14:59:48 2012
+++ packages/rpm-build-macros/rpm.macros	Fri Feb 17 19:17:29 2012
@@ -2137,11 +2137,13 @@
 #
 # Usage:
 # %systemd_reload
+# %systemd_service <unit command> service_name1.service service_name2.service
 # %systemd_service_enable service_name1.service service_name2.service
 # %systemd_service_disable service_name1.service service_name2.service
 # %systemd_service_start service_name1.service service_name2.service
 # %systemd_service_stop service_name1.service service_name2.service
 # %systemd_service_restart service_name1.service service_name2.service
+# %systemd_service_reload service_name1.service service_name2.service
 #
 # %systemd_post service_name1.service service_name2.service
 # %systemd_preun service_name1.service service_name2.service
@@ -2161,7 +2163,7 @@
 # %systemd_trigger %{name}.service
 #
 # Requirements:
-# BuildRequires:	rpmbuild(macros) >= 1.644
+# BuildRequires:	rpmbuild(macros) >= 1.647
 # Requires:	systemd-units >= 38
 
 %systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
@@ -2177,6 +2179,11 @@
 	/bin/systemctl --quiet disable %{*} || : \
 %{nil}
 
+%systemd_service() \
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+	/bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
+%{nil}
+
 %systemd_service_start() \
 	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
 	/bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
@@ -2190,6 +2197,11 @@
 %systemd_service_restart() \
 	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
 	/bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
+%{nil}
+
+%systemd_service_reload() \
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+	/bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
 %{nil}
 
 %systemd_trigger() \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.323&r2=1.324&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.646&r2=1.647&f=u