From 01ad8e1de66bc9b911858023a4fe34f5242a81e0831c50abeacc7d6317dce091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Thu, 7 Dec 2017 14:03:43 +0000 Subject: [PATCH] Accepting request 554998 from home:dimstar:Factory Fix build with RPM 4.14 OBS-URL: https://build.opensuse.org/request/show/554998 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=105 --- salt.changes | 6 ++++++ salt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/salt.changes b/salt.changes index e46854c..1bad4b1 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 7 11:19:12 UTC 2017 - dimstar@opensuse.org + +- Escape the usage of %{VERSION} when calling out to rpm. + RPM 4.14 has %{VERSION} defined as 'the main packages version'. + ------------------------------------------------------------------- Fri Dec 1 15:33:01 UTC 2017 - mihai.dinca@suse.com diff --git a/salt.spec b/salt.spec index 009ef03..7acd1cf 100644 --- a/salt.spec +++ b/salt.spec @@ -711,7 +711,7 @@ if [ $1 -eq 2 ] ; then true fi %if %{with systemd} -if [ `rpm -q systemd --queryformat="%{VERSION}"` -lt 228 ]; then +if [ `rpm -q systemd --queryformat="%%{VERSION}"` -lt 228 ]; then # On systemd < 228 the 'TasksTask' attribute is not available. # Removing TasksMax from salt-master.service on SLE12SP1 LTSS (bsc#985112) sed -i '/TasksMax=infinity/d' %{_unitdir}/salt-master.service