Accepting request 533951 from systemsmanagement:saltstack:testing

- Add possibility to generate _version.py at the build time for
  raw builds: https://github.com/saltstack/salt/pull/43955
- Added:
  * enable-with-salt-version-parameter-for-setup.py-scri.patch

- Update to 2017.7.2
  See https://docs.saltstack.com/en/develop/topics/releases/2017.7.2.html
  for full changelog
- Fix for CVE-2017-14695 (bsc#1062462)
- Fix for CVE-2017-14696 (bsc#1062464)
- Fix salt target-type field returns "String" for existing 
  jids but an empty "Array" for non existing jids. (issue #1711)
- Added:
 * bugfix-always-return-a-string-list-on-unknown-job-ta.patch

- Fixed minion resource exhaustion when many functions are being
  executed in parallel (bsc#1059758)
- Added:
  * introduce-process_count_max-minion-configuration-par.patch
  * multiprocessing-minion-option-documentation-fixes.patch

- Remove 'TasksTask' attribute from salt-master.service in older
  versions of systemd (bsc#985112)
- Provide custom SUSE salt-master.service file.

- Fix wrong version reported by Salt (bsc#1061407)

- list_pkgs: add parameter for returned attribute selection (bsc#1052264)
- Adding the leftover for zypper and yum list_pkgs functionality.
- Use $HOME to get the user home directory instead using '~' char (bsc#1042749)

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

salt.spec

@@ -36,19 +36,36 @@
 %bcond_with    builddocs
 
 Name:           salt
-Version:        2017.7.1
+Version:        2017.7.2
 Release:        0
 Summary:        A parallel remote execution system
 License:        Apache-2.0
 Group:          System/Management
 Url:            http://saltstack.org/
-Source:         https://github.com/saltstack/salt/archive/v2017.7.1.tar.gz
+Source:         https://github.com/saltstack/salt/archive/v%{version}.tar.gz
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d
 Source3:        html.tar.bz2
 Source4:        update-documentation.sh
 Source5:        travis.yml
 
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/42310
+#                    https://github.com/saltstack/salt/pull/42718
+#                    https://github.com/saltstack/salt/pull/43195
+#                    https://github.com/saltstack/salt/pull/43214
+#                    https://github.com/saltstack/salt/pull/43281
+Patch1:         list_pkgs-add-parameter-for-returned-attribute-selec.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43441
+Patch2:         use-home-to-get-the-user-home-directory-instead-usin.patch 
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43663
+Patch3:         multiprocessing-minion-option-documentation-fixes.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43669
+Patch4:         introduce-process_count_max-minion-configuration-par.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/
+Patch5:         bugfix-always-return-a-string-list-on-unknown-job-ta.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/43955
+Patch6:         enable-with-salt-version-parameter-for-setup.py-scri.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  logrotate
@@ -386,8 +403,16 @@ Zsh command line completion support for %{name}.
 cp %{S:1} .
 cp %{S:5} ./.travis.yml
 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
 %build
-%{__python} setup.py --salt-transport=both build
+%{__python} setup.py --with-salt-version=%{version} --salt-transport=both build
+cp ./build/lib/salt/_version.py ./salt
 
 %if %{with docs} && %{without builddocs}
 # extract docs from the tarball
@@ -459,7 +484,7 @@ install scripts/suse/yum/plugins/yumnotify.conf %{buildroot}/etc/yum/pluginconf.
 
 ## install init and systemd scripts
 %if %{with systemd}
-install -Dpm 0644 pkg/salt-master.service %{buildroot}%{_unitdir}/salt-master.service
+install -Dpm 0644 pkg/suse/salt-master.service %{buildroot}%{_unitdir}/salt-master.service
 %if 0%{?suse_version}
 install -Dpm 0644 pkg/suse/salt-minion.service %{buildroot}%{_unitdir}/salt-minion.service
 %else
@@ -692,6 +717,11 @@ if [ $1 -eq 2 ] ; then
   true
 fi
 %if %{with systemd}
+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
+fi
 %if 0%{?suse_version}
 %service_add_post salt-master.service
 %fillup_only