Accepting request 256883 from home:tsaupe:branches:Base:System

make systemd aware of changed unit file content after update

OBS-URL: https://build.opensuse.org/request/show/256883
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=5

systemd-daemon-reload-before-service-restart.patch

@@ -0,0 +1,11 @@
+diff -Naur orig/macros.systemd mod/macros.systemd
+--- orig/macros.systemd	2014-10-14 08:54:56.264889350 +0200
++++ mod/macros.systemd	2014-10-15 13:10:43.134133358 +0200
+@@ -108,6 +108,7 @@
+ if [ $FIRST_ARG -ge 1 ]; then								\
+ # Package upgrade, not uninstall							\
+   if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then \
++    /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :					\
+     /usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || :					\
+   fi \
+ else # package uninstall								\

systemd-rpm-macros.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 15 09:28:36 UTC 2014 - thomas.blume@suse.com
+
+- make systemd aware of changed unit file content after update
+  add systemd-daemon-reload-before-service-restart.patch 
+ 
 -------------------------------------------------------------------
 Thu Mar 27 14:44:53 UTC 2014 - werner@suse.de
 

systemd-rpm-macros.spec

@@ -29,12 +29,16 @@ Source0:        macros.systemd
 Requires:       coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+# make systemd aware of changed unit file content after update
+Patch0:         systemd-daemon-reload-before-service-restart.patch  
 
 %description
 Starting with openSUSE 12.1, several RPM macros must be used to package systemd
 services files. This package provides these macros.
 
 %prep
+cd %{_sourcedir}
+%patch0 -p1
 
 %build