1 --- rpm-build-macros-1.680/rpm.macros~ 2013-11-27 01:15:12.122464636 +0200
2 +++ rpm-build-macros-1.680/rpm.macros 2013-11-27 01:16:06.644922965 +0200
4 # tmpfiles.d configuration. Warn and terminate build if config is
7 -#%no_install_post_check_tmpfiles 1
8 +%no_install_post_check_tmpfiles 1
10 %__spec_install_post_check_tmpfiles { \
11 __spec_install_post_check_tmpfiles() { \
12 @@ -2258,79 +2258,17 @@
13 # BuildRequires: rpmbuild(macros) >= 1.671
14 # Requires: systemd-units >= 38
16 -%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
18 -%systemd_service_enable() \
19 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
20 - /bin/systemctl --quiet enable %{*} || : \
21 - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
24 -%systemd_service_disable() \
25 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
26 - /bin/systemctl --quiet disable %{*} || : \
30 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
31 - /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
34 -%systemd_service_start() \
35 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
36 - /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
39 -%systemd_service_stop() \
40 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
41 - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
44 -%systemd_service_restart() \
45 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
46 - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
49 -%systemd_service_reload() \
50 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
51 - /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
55 -want_enable_service() { \
56 - [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
57 - [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
58 - [ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service})" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service}" ] && return 1 \
61 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
63 - if want_enable_service $s; then \
64 - /bin/systemctl --quiet enable $s || : \
70 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
71 - /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \
72 - if [ $1 -eq 1 ]; then \
73 - /bin/systemctl --quiet enable %{*} || : \
74 - /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
75 - elif [ -z "$NORESTART" ]; then \
76 - /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
78 - /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \
83 - if [ $1 -eq 0 ]; then \
84 - export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
85 - /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
86 - /bin/systemctl --quiet disable %{*} || : \
89 +%systemd_reload %{nil}
90 +%systemd_service_enable() %{nil}
91 +%systemd_service_disable() %{nil}
92 +%systemd_service() %{nil}
93 +%systemd_service_start() %{nil}
94 +%systemd_service_stop() %{nil}
95 +%systemd_service_restart() %{nil}
96 +%systemd_service_reload() %{nil}
97 +%systemd_trigger() %{nil}
98 +%systemd_post() %{nil}
99 +%systemd_preun() %{nil}
101 %systemdunitdir /lib/systemd/system
102 %systemdtmpfilesdir /usr/lib/tmpfiles.d
103 --- ./service_generator.sh 1 Feb 2012 17:46:43 -0000 1.13
104 +++ ./service_generator.sh 4 Jan 2012 05:09:03 -0000 1.11
109 - if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
110 - if [ -f /var/lock/subsys/$service ]; then
111 + if [ -f /var/lock/subsys/$service ]; then
113 if [ "$noop" = 1 ]; then
117 if [ "$quiet" != 1 ]; then
120 - echo 'Run "/sbin/service $service start" to start $desc.'
122 + echo 'Run "/sbin/service $service start" to start $desc.'
132 # service restart was disabled, tell them to restart it
134 - if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
135 - if [ -f /var/lock/subsys/$service ]; then
136 - echo 'Run "/sbin/service $service restart" to restart $desc.'
138 + if [ -f /var/lock/subsys/$service ]; then
139 + echo 'Run "/sbin/service $service restart" to restart $desc.'