autotag: make git complatible (however needs to be in package dir)

[packages/rpm-build-macros.git] / disable-systemd.patch

diff --git a/disable-systemd.patch b/disable-systemd.patch
index 8c34bdde88eec3105bae4b8215f16d75ae9321f5..208c2ab99213b616831d056d1fe936994501c852 100644 (file)
--- a/disable-systemd.patch
+++ b/disable-systemd.patch
@@ -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}
@@ -115,3 +91,43 @@
  
  %systemdunitdir /lib/systemd/system
  %systemdtmpfilesdir /usr/lib/tmpfiles.d
+--- ./service_generator.sh     1 Feb 2012 17:46:43 -0000       1.13
++++ ./service_generator.sh     4 Jan 2012 05:09:03 -0000       1.11
+@@ -19,8 +19,7 @@
+ # common part
+ service_body() {
+       cat <<-EOF
+-              if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+-                      if [ -f /var/lock/subsys/$service ]; then
++              if [ -f /var/lock/subsys/$service ]; then
+       EOF
+       if [ "$noop" = 1 ]; then
+               echo :
+@@ -32,12 +31,11 @@
+ 
+       if [ "$quiet" != 1 ]; then
+               cat <<-EOF
+-                      else
+-                              echo 'Run "/sbin/service $service start" to start $desc.'
++              else
++                      echo 'Run "/sbin/service $service start" to start $desc.'
+               EOF
+       fi
+       cat <<-EOF
+-                      fi
+               fi
+       EOF
+ }
+@@ -61,10 +59,8 @@
+       echo 'else'
+               # service restart was disabled, tell them to restart it
+       cat <<-EOF
+-              if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+-                      if [ -f /var/lock/subsys/$service ]; then
+-                              echo 'Run "/sbin/service $service restart" to restart $desc.'
+-                      fi
++              if [ -f /var/lock/subsys/$service ]; then
++                      echo 'Run "/sbin/service $service restart" to restart $desc.'
+               fi
+       EOF
+       echo 'fi'