Accepting request 581002 from systemsmanagement:saltstack:testing

- Remove salt-minion python2 requirement when python3 is default (bsc#1081592)

- Remove-obsolete-unicode-handling-in-pkg.info_installed
- Added:
  * remove-obsolete-unicode-handling-in-pkg.info_install.patch

- Update to salt-2018.1.99
- Modified:
  * activate-all-beacons-sources-config-pillar-grains.patch
  * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
  * feat-add-grain-for-all-fqdns.patch
  * fix-bsc-1065792.patch
  * list_pkgs-add-parameter-for-returned-attribute-selec.patch
  * run-salt-api-as-user-salt-bsc-1064520.patch
  * run-salt-master-as-dedicated-salt-user.patch
- Deleted:
  * python3-compatibility-fix-got-bytes-instead-of-strin.patch
  * enable-with-salt-version-parameter-for-setup.py-scri.patch
  * catching-error-when-pidfile-cannot-be-deleted.patch
  * bugfix-always-return-a-string-list-on-unknown-job-ta.patch
  * bugfix-the-logic-according-to-the-exact-described-pu.patch
  * cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch
  * fix-for-delete_deployment-in-kubernetes-module.patch
  * fix-salt-master-for-old-psutil.patch
  * introduce-process_count_max-minion-configuration-par.patch
  * multiprocessing-minion-option-documentation-fixes.patch
  * older-logrotate-need-su-directive.patch
  * return-error-when-gid_from_name-and-group-does-not-e.patch
  * set-shell-environment-variable-64.patch
  * split-only-strings-if-they-are-such.patch

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

salt.spec

@@ -52,44 +52,31 @@
 %bcond_with    builddocs
 
 Name:           salt
-Version:        2017.7.2
+Version:        2018.1.99
 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/v%{version}.tar.gz
+# Source:         https://github.com/saltstack/salt/archive/v%{version}.tar.gz
+Source:         https://github.com/saltstack/salt/archive/2018.3.0rc1.tar.gz
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d
 Source3:        html.tar.bz2
 Source4:        update-documentation.sh
 Source5:        travis.yml
 
-Patch1:        list_pkgs-add-parameter-for-returned-attribute-selec.patch
-Patch2:        use-home-to-get-the-user-home-directory-instead-usin.patch
-Patch3:        multiprocessing-minion-option-documentation-fixes.patch
-Patch4:        introduce-process_count_max-minion-configuration-par.patch
-Patch5:        bugfix-always-return-a-string-list-on-unknown-job-ta.patch
-Patch6:        enable-with-salt-version-parameter-for-setup.py-scri.patch
-Patch7:        run-salt-master-as-dedicated-salt-user.patch
-Patch8:        run-salt-api-as-user-salt-bsc-1064520.patch
-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:       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
+Patch1:        run-salt-master-as-dedicated-salt-user.patch
+Patch2:        run-salt-api-as-user-salt-bsc-1064520.patch
+Patch3:        activate-all-beacons-sources-config-pillar-grains.patch
+Patch4:        avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
+Patch5:        feat-add-grain-for-all-fqdns.patch
+Patch6:        fix-bsc-1065792.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46006
+Patch7:        remove-obsolete-unicode-handling-in-pkg.info_install.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-2018.3.0rc1-build
 BuildRequires:  logrotate
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
@@ -531,7 +518,8 @@ Zsh command line completion support for %{name}.
 %endif
 
 %prep
-%setup -q -n salt-%{version}
+# %setup -q -n salt-%{version}
+%setup -q -n salt-2018.3.0rc1
 cp %{S:1} .
 cp %{S:5} ./.travis.yml
 %patch1 -p1
@@ -541,22 +529,6 @@ cp %{S:5} ./.travis.yml
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
 
 %build
 %if 0%{?build_py2}
@@ -649,6 +621,9 @@ install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/pki/minion
 %if 0%{?suse_version}
 install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit
 %{__install} scripts/suse/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
+%if 0%{?default_py3}
+sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!/usr/bin/python3=' %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
+%endif
 %endif
 
 # Install Yum plugins only on RH machines