From: Tadej Janež <tadej.j@nez.si>
Date: Sun, 22 Nov 2015 19:38:05 +0000 (+0100)
Subject: rpm: fix %systemd_user_post() macro.
X-Git-Tag: v229~290^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1986%2Fhead;p=thirdparty%2Fsystemd.git

rpm: fix %systemd_user_post() macro.

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.
---

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index 8a0e44b58c9..2cace3d3ba5 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 \