Author: baggins Date: Fri Feb 17 13:55:54 2012 GMT Module: packages Tag: HEAD ---- Log message: - 1.644 - add new and cleanup existing systemd macros
---- Files affected: packages/rpm-build-macros: rpm-build-macros.spec (1.322 -> 1.323) , rpm.macros (1.643 -> 1.644) ---- Diffs: ================================================================ Index: packages/rpm-build-macros/rpm-build-macros.spec diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.322 packages/rpm-build-macros/rpm-build-macros.spec:1.323 --- packages/rpm-build-macros/rpm-build-macros.spec:1.322 Fri Feb 10 19:32:21 2012 +++ packages/rpm-build-macros/rpm-build-macros.spec Fri Feb 17 14:55:48 2012 @@ -1,5 +1,5 @@ # $Revision$, $Date$ -%define rpm_macros_rev 1.642 +%define rpm_macros_rev 1.644 %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.323 2012/02/17 13:55:48 baggins +- 1.644 +- add new and cleanup existing systemd macros + Revision 1.322 2012/02/10 18:32:21 baggins - 1.642 - prefer normal kernel trees over our -(non)dist/smp/up hacks when building ================================================================ Index: packages/rpm-build-macros/rpm.macros diff -u packages/rpm-build-macros/rpm.macros:1.643 packages/rpm-build-macros/rpm.macros:1.644 --- packages/rpm-build-macros/rpm.macros:1.643 Sat Feb 11 12:41:14 2012 +++ packages/rpm-build-macros/rpm.macros Fri Feb 17 14:55:48 2012 @@ -2133,9 +2133,17 @@ # pre/post script for packages supporting systemd units # # Author: Bartlomiej Zimon <[email protected]> +# Jan Rękorajski <[email protected]> # # Usage: # %systemd_reload +# %systemd_service_enable <-f> 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_trigger service_name1.service service_name2.service +# # %systemd_post service_name1.service service_name2.service # %systemd_preun service_name1.service service_name2.service # %systend_trigger service_name1.service service_name2.service @@ -2154,11 +2162,37 @@ # %systemd_trigger %{name}.service # # Requirements: -# BuildRequires: rpmbuild(macros) >= 1.627 -# Requires: systemd-units >= 37-0.10 +# BuildRequires: rpmbuild(macros) >= 1.643 +# Requires: systemd-units >= 38-1 %systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || : +%systemd_service_enable() \ + export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ + /bin/systemctl --quiet enable %{*} || : \ + /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \ +%{nil} + +%systemd_service_disable() \ + export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ + /bin/systemctl --quiet disable %{*} || : \ +%{nil} + +%systemd_service_start() \ + export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ + /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \ +%{nil} + +%systemd_service_stop() \ + export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ + /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \ +%{nil} + +%systemd_service_restart() \ + export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ + /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \ +%{nil} + %systemd_trigger() \ want_enable_service() { \ [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \ @@ -2179,19 +2213,19 @@ /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \ if [ $1 -eq 1 ]; then \ /bin/systemctl --quiet enable %{*} || : \ - fi \ - if [ $1 -gt 1 ] && [ -z "$NORESTART" ]; then \ - /bin/systemctl --quiet try-restart %{*} || : \ + /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \ + elif [ -z "$NORESTART" ]; then \ + /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \ + else \ + /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \ fi \ %{nil} %systemd_preun() \ if [ $1 -eq 0 ]; then \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \ - /bin/systemctl --no-reload --quiet disable %{*} || : \ - if /bin/systemd_booted; then \ - /bin/systemctl --quiet stop %{*} || : \ - fi \ + export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ + /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \ + /bin/systemctl --quiet disable %{*} || : \ fi \ %{nil} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.322&r2=1.323&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.643&r2=1.644&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
