Author: glen Date: Tue Mar 13 16:11:59 2012 GMT Module: packages Tag: HEAD ---- Log message: - patch without previous (never commited) patch
---- Files affected: packages/rpm-build-macros: disable-systemd.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/rpm-build-macros/disable-systemd.patch diff -u packages/rpm-build-macros/disable-systemd.patch:1.1 packages/rpm-build-macros/disable-systemd.patch:1.2 --- packages/rpm-build-macros/disable-systemd.patch:1.1 Tue Mar 13 17:11:31 2012 +++ packages/rpm-build-macros/disable-systemd.patch Tue Mar 13 17:11:54 2012 @@ -1,67 +1,48 @@ ---- rpm-build-macros-1.647/rpm.macros~ 2012-03-13 18:04:59.299040446 +0200 -+++ rpm-build-macros-1.647/rpm.macros 2012-03-13 18:07:15.119860476 +0200 -@@ -2165,103 +2165,18 @@ - # Requirements: +--- rpm-build-macros-1.647/rpm.macros~ 2012-03-13 18:09:42.876512532 +0200 ++++ rpm-build-macros-1.647/rpm.macros 2012-03-13 18:10:01.389010815 +0200 +@@ -2166,79 +2166,17 @@ # BuildRequires: rpmbuild(macros) >= 1.647 # Requires: systemd-units >= 38 --%systemd_reload \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ --/bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || : \ --%endif \ --%{nil} +-%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || : +- -%systemd_service_enable() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemctl --quiet enable %{*} || : \ - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \ --%endif \ -%{nil} - -%systemd_service_disable() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemctl --quiet disable %{*} || : \ --%endif \ -%{nil} - -%systemd_service() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \ --%endif \ -%{nil} - -%systemd_service_start() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \ --%endif \ -%{nil} - -%systemd_service_stop() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \ --%endif \ -%{nil} - -%systemd_service_restart() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \ --%endif \ -%{nil} - -%systemd_service_reload() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \ --%endif \ -%{nil} - -%systemd_trigger() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ -want_enable_service() { \ - [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \ - [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \ @@ -74,11 +55,9 @@ - /bin/systemctl --quiet enable $s || : \ - fi \ - done \ --%endif \ -%{nil} - -%systemd_post() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \ - if [ $1 -eq 1 ]; then \ @@ -89,17 +68,14 @@ - else \ - /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \ - fi \ --%endif \ -%{nil} - -%systemd_preun() \ --%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \ - if [ $1 -eq 0 ]; then \ - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \ - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \ - /bin/systemctl --quiet disable %{*} || : \ - fi \ --%endif \ -%{nil} +%systemd_reload %{nil} +%systemd_service_enable() %{nil} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/disable-systemd.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit