- 1.647

- added generic systemd_service macro and systemd_service_reload

Changed files:
    rpm-build-macros.spec -> 1.324
    rpm.macros -> 1.647

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 395d219403da3524ced6068791b289c9d14ab489..ae0b2331a0d3ebae036d5a55e5b5bdf15bc5645d 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%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

diff --git a/rpm.macros b/rpm.macros
index 7e32c40094ab8a426eda38a7d6b357bb8c38cc8d..545d011b96da1ff58782acf6e5f0e8ba9be1e55d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2137,11 +2137,13 @@ fi; \
 #
 # 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 @@ fi; \
 # %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 @@ fi; \
        /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 %{*} || : \
@@ -2192,6 +2199,11 @@ fi; \
        /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() \
 want_enable_service() { \
        [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \