From dda4324fa0b1fb1e07dea18585df6962d8f34b0f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>

Date: Sun, 22 Nov 2015 20:38:05 +0100

Subject: [PATCH] rpm: fix %systemd_user_post() macro.

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Escape "--user" and "--global" arguments with "\\" since rpm treats

arguments starting with "-" as macro options which causes "Unknown

option" rpm error.

Use %{expand:...} to force expansion of the inner macro. Otherwise %{?*}

is recursively defined as "\--user \--global {%?*}" which causes

"Too many levels of recursion in macro expansion" rpm error.

Thanks to Michael Mráka for helping me fix the above issues.

(cherry picked from commit e67ba783696f21782ad5c2ba00515d387016e785)

Related: #1582383

---

 src/core/macros.systemd.in | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in

index bea6ef1da3..662791cccc 100644

--- a/src/core/macros.systemd.in

+++ b/src/core/macros.systemd.in

@@ -43,7 +43,7 @@ if [ $1 -eq 1 ] ; then \

 fi \

 %{nil}

-%systemd_user_post() %systemd_post --user --global %{?*}

+%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}}

 %systemd_preun() \

 if [ $1 -eq 0 ] ; then \