Accepting request 573717 from systemsmanagement:saltstack:testing

- Prevent queryformat pattern from expanding (bsc#1079048)

- Fix epoch handling for Rhel 6 and 7 (bsc#1068566)
- Reverting to current API for split_input
- Added:
  * yumpkg-don-t-use-diff_attr-when-determining-install-.patch
- Removed:
  * fix-for-wrong-version-processing.patch

- Fix for wrong version processing during yum pkg install (bsc#1068566)
- Older logrotate need su directive (bsc#1071322)

OBS-URL: https://build.opensuse.org/request/show/573717
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=110

salt.spec

@@ -77,17 +77,17 @@ Patch9:        activate-all-beacons-sources-config-pillar-grains.patch
 Patch10:       fix-for-delete_deployment-in-kubernetes-module.patch
 Patch11:       catching-error-when-pidfile-cannot-be-deleted.patch
 Patch12:       avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
-Patch13:       fix-for-wrong-version-processing.patch
-Patch14:       older-logrotate-need-su-directive.patch
-Patch15:       fix-salt-master-for-old-psutil.patch
-Patch16:       split-only-strings-if-they-are-such.patch
-Patch17:       cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch
-Patch19:       python3-compatibility-fix-got-bytes-instead-of-strin.patch
-Patch20:       feat-add-grain-for-all-fqdns.patch
-Patch21:       fix-bsc-1065792.patch
-Patch22:       set-shell-environment-variable-64.patch
-Patch23:       bugfix-the-logic-according-to-the-exact-described-pu.patch
-Patch24:       return-error-when-gid_from_name-and-group-does-not-e.patch
+Patch13:       older-logrotate-need-su-directive.patch
+Patch14:       fix-salt-master-for-old-psutil.patch
+Patch15:       split-only-strings-if-they-are-such.patch
+Patch16:       cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch
+Patch17:       python3-compatibility-fix-got-bytes-instead-of-strin.patch
+Patch19:       feat-add-grain-for-all-fqdns.patch
+Patch20:       fix-bsc-1065792.patch
+Patch21:       set-shell-environment-variable-64.patch
+Patch22:       bugfix-the-logic-according-to-the-exact-described-pu.patch
+Patch23:       return-error-when-gid_from_name-and-group-does-not-e.patch
+Patch24:       yumpkg-don-t-use-diff_attr-when-determining-install-.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  logrotate
@@ -904,7 +904,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