- remove confusing --user before --global

Backport from
  28d36da64a.
  This was spotted in bsc#1090785.

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

macros.systemd

@@ -199,7 +199,7 @@ if [ $1 -eq 1 -a -x /usr/bin/systemctl ] ; then						\
 fi											\
 %{nil}
 
-%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}} 
+%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}} 
 
 #
 # Options used if not in an installation systems
@@ -219,7 +219,7 @@ fi											\
 %systemd_user_preun()									\
 if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
         # Package removal, not upgrade							\
-        /usr/bin/systemctl --no-reload --user --global disable %{?*} || :		\
+        /usr/bin/systemctl --global disable %{?*} || :		\
 fi											\
 %{nil}
 

systemd-rpm-macros.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 22 12:54:45 UTC 2018 - fbui@suse.com
+
+- remove confusing --user before --global
+
+  Backport from
+  https://github.com/systemd/systemd/commit/28d36da64a7a23a55e8d0a139f2620384fd058b3.
+
+  This was spotted in bsc#1090785.
+
 -------------------------------------------------------------------
 Wed Feb 14 14:04:19 UTC 2018 - fbui@suse.com
 

systemd-rpm-macros.spec

@@ -20,7 +20,7 @@ Name:           systemd-rpm-macros
 Version:        3
 Release:        0
 Summary:        RPM macros for systemd
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Tools/Building
 Url:            http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
 Source0:        macros.systemd