From 30f9356379bcbdb35913fb0646d707062534765988ff6cb81f9c336614d3ac3d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 22 Jan 2018 14:11:14 +0000 Subject: [PATCH] Accepting request 568124 from home:dimstar:Factory - Fix system_user_post macro for usage with RPM 4.14, backport from https://github.com/systemd/systemd/commit/e67ba783. Addresses build issues like https://build.opensuse.org/package/live_build_log/openSUSE:Factory/appimaged/standard/x86_64 OBS-URL: https://build.opensuse.org/request/show/568124 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=26 --- macros.systemd | 2 +- systemd-rpm-macros.changes | 6 ++++++ systemd-rpm-macros.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) 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