Accepting request 586784 from systemsmanagement:saltstack:testing

- Update patches
- Modified:
  * run-salt-master-as-dedicated-salt-user.patch
  * run-salt-api-as-user-salt-bsc-1064520.patch
  * fix-openscap-push.patch
  * fix-cp.push-empty-file.patch
  * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
  * feat-add-grain-for-all-fqdns.patch
  * fix-bsc-1065792.patch
  * move-log_file-option-to-changeable-defaults.patch
  * activate-all-beacons-sources-config-pillar-grains.patch
  * remove-obsolete-unicode-handling-in-pkg.info_install.patch
  
- Removed:
  * salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
  
-------------------------------------------------------------------                                                                                                     
                                                                                    
- Update cp.push patch
- Modified:
  * fix-cp.push-empty-file.patch
  * salt-ssh-fix-json-load-of-return-data-when-it-contai.patch

- force re-generate a new thin.tgz when an update gets installed

- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:

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

salt.spec

@@ -74,8 +74,11 @@ 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
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46278
-Patch8:        fix-grains-with-n.patch
+Patch8:        fix-openscap-push.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/45972
+Patch9:        move-log_file-option-to-changeable-defaults.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/46416
+Patch10:       fix-cp.push-empty-file.patch
 
 # BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRoot:      %{_tmppath}/%{name}-2018.3.0rc1-build
@@ -532,6 +535,8 @@ cp %{S:5} ./.travis.yml
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 %if 0%{?build_py2}
@@ -1023,6 +1028,16 @@ fi
 %endif
 %endif
 
+%posttrans -n python2-salt
+# force re-generate a new thin.tgz
+rm -f %{_localstatedir}/cache/salt/master/thin/version
+
+%if 0%{?build_py3}
+%posttrans -n python3-salt
+# force re-generate a new thin.tgz
+rm -f %{_localstatedir}/cache/salt/master/thin/version
+%endif
+
 %files api
 %defattr(-,root,root)
 %{_bindir}/salt-api