Hello community,
here is the log from the commit of package systemd-rpm-macros for
openSUSE:Factory checked in at 2018-05-25 21:33:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros"
Fri May 25 21:33:50 2018 rev:25 rq:611238 version:3
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2018-02-16 21:26:31.454388848 +0100
+++
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes
2018-05-25 21:33:51.347479302 +0200
@@ -1,0 +2,10 @@
+Tue May 22 12:54:45 UTC 2018 - f...@suse.com
+
+- remove confusing --user before --global
+
+ Backport from
+
https://github.com/systemd/systemd/commit/28d36da64a7a23a55e8d0a139f2620384fd058b3.
+
+ This was spotted in bsc#1090785.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.33IKLx/_old 2018-05-25 21:33:51.971456723 +0200
+++ /var/tmp/diff_new_pack.33IKLx/_new 2018-05-25 21:33:51.975456579 +0200
@@ -20,7 +20,7 @@
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
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.33IKLx/_old 2018-05-25 21:33:52.019454987 +0200
+++ /var/tmp/diff_new_pack.33IKLx/_new 2018-05-25 21:33:52.019454987 +0200
@@ -199,7 +199,7 @@
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 @@
%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}
