rpm/salt
SHA256
1
0
Fork 0
forked from pool/salt
Code Pull Requests Activity

Accepting request 554998 from home:dimstar:Factory

Browse Source 
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
This commit is contained in:
Klaus Kämpf 2017-12-07 14:03:43 +00:00 committed by Git OBS Bridge
parent eb05612b2e
commit 01ad8e1de6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt.changes
View File

@ -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 Fri Dec 1 15:33:01 UTC 2017 - mihai.dinca@suse.com

2
salt.spec
View File

@ -711,7 +711,7 @@ if [ $1 -eq 2 ] ; then
true true
fi fi
%if %{with systemd} %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. # On systemd < 228 the 'TasksTask' attribute is not available.
# Removing TasksMax from salt-master.service on SLE12SP1 LTSS (bsc#985112) # Removing TasksMax from salt-master.service on SLE12SP1 LTSS (bsc#985112)
sed -i '/TasksMax=infinity/d' %{_unitdir}/salt-master.service sed -i '/TasksMax=infinity/d' %{_unitdir}/salt-master.service