1 --- rpm-build-macros-1.647/rpm.macros~ 2012-03-13 18:04:59.299040446 +0200
2 +++ rpm-build-macros-1.647/rpm.macros 2012-03-13 18:07:15.119860476 +0200
3 @@ -2165,103 +2165,18 @@
5 # BuildRequires: rpmbuild(macros) >= 1.647
6 # Requires: systemd-units >= 38
8 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
9 -/bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || : \
13 -%systemd_service_enable() \
14 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
15 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
16 - /bin/systemctl --quiet enable %{*} || : \
17 - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
21 -%systemd_service_disable() \
22 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
23 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
24 - /bin/systemctl --quiet disable %{*} || : \
29 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
30 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
31 - /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
35 -%systemd_service_start() \
36 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
37 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
38 - /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
42 -%systemd_service_stop() \
43 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
44 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
45 - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
49 -%systemd_service_restart() \
50 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
51 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
52 - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
56 -%systemd_service_reload() \
57 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
58 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
59 - /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
64 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
65 -want_enable_service() { \
66 - [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
67 - [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
68 - /sbin/chkconfig --list ${1%.service} 2>/dev/null | grep -qsv "[0-6]:on" && return 1 \
71 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
73 - if want_enable_service $s; then \
74 - /bin/systemctl --quiet enable $s || : \
81 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
82 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
83 - /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \
84 - if [ $1 -eq 1 ]; then \
85 - /bin/systemctl --quiet enable %{*} || : \
86 - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
87 - elif [ -z "$NORESTART" ]; then \
88 - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
90 - /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \
96 -%if 0%{?_with_systemd:1}%{!?_without_systemd:1} \
97 - if [ $1 -eq 0 ]; then \
98 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
99 - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
100 - /bin/systemctl --quiet disable %{*} || : \
104 +%systemd_reload %{nil}
105 +%systemd_service_enable() %{nil}
106 +%systemd_service_disable() %{nil}
107 +%systemd_service() %{nil}
108 +%systemd_service_start() %{nil}
109 +%systemd_service_stop() %{nil}
110 +%systemd_service_restart() %{nil}
111 +%systemd_service_reload() %{nil}
112 +%systemd_trigger() %{nil}
113 +%systemd_post() %{nil}
114 +%systemd_preun() %{nil}
116 %systemdunitdir /lib/systemd/system
117 %systemdtmpfilesdir /usr/lib/tmpfiles.d