From c6c149ba4cb976454d1c6bf807951a57cf9d253caf1e2372b17dc8a939501003 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 22 May 2018 12:56:47 +0000 Subject: [PATCH] - remove confusing --user before --global Backport from https://github.com/systemd/systemd/commit/28d36da64a7a23a55e8d0a139f2620384fd058b3. 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 | 4 ++-- systemd-rpm-macros.changes | 10 ++++++++++ systemd-rpm-macros.spec | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/macros.systemd b/macros.systemd index 3d9906f..bd6c556 100644 --- a/macros.systemd +++ b/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} diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 48ce5f3..dcc86df 100644 --- a/systemd-rpm-macros.changes +++ b/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 diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec index 75ea568..bcb3548 100644 --- a/systemd-rpm-macros.spec +++ b/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