diff --git a/macros.systemd b/macros.systemd index 02c49c4..2b2ad23 100644 --- a/macros.systemd +++ b/macros.systemd @@ -196,7 +196,7 @@ if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then \ fi \ %{nil} -%systemd_user_post() %systemd_post --user --global %{?*} +%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}} # # Options used if not in an installation systems diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index e468bde..c1be3a8 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 22 11:33:28 UTC 2018 - dimstar@opensuse.org + +- Fix system_user_post macro for usage with RPM 4.14, backport from + https://github.com/systemd/systemd/commit/e67ba783. + ------------------------------------------------------------------- Thu Dec 14 08:39:15 UTC 2017 - fbui@suse.com diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec index 9fe6959..75ea568 100644 --- a/systemd-rpm-macros.spec +++ b/systemd-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-rpm-macros # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed