Accepting request 431090 from systemsmanagement:saltstack:testing

- Rename susemanager plugin to zyppnotify, as it is not SUSE Manager specific
- Remove the subpackage and put the plugin back to the main package
- Revert the github->pypi Source change, as github is the official URL
  according to upstream
  Add:
  * 0007-Add-zypp-notify-plugin.patch
  Remove:
  * 0007-Add-SUSE-Manager-plugin.patch

- Add upstream patch to fix pkg.upgrade for zypper
  Add:
  * 0021-Fix-pkg.upgrade-for-zypper.patch

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

salt.spec

@@ -48,6 +48,7 @@ Source0:        https://github.com/saltstack/salt/releases/download/v%{version}/
 Source1:        README.SUSE
 Source2:        salt-tmpfiles.d
 Source3:        html.tar.bz2
+Source4:        update-documentation.sh
 
 # PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
 # We do not upstream this patch because this is something that we have to fix on our side
@@ -71,7 +72,7 @@ Patch6:         0006-Create-salt-proxy-instantiated-service-file.patch
 # PATCH-FIX-OPENSUSE Generate events from the Salt minion,
 #                    if Zypper has been used outside the Salt infrastructure
 # We do not upstream this because this is for SUSE only (15.08.2016)
-Patch7:         0007-Add-SUSE-Manager-plugin.patch
+Patch7:         0007-Add-zypp-notify-plugin.patch
 # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33469
 # PR already merged. This will be gone in the next version
 Patch8:         0008-checksum-validation-when-zypper-pkg.download.patch
@@ -107,6 +108,8 @@ Patch18:        0018-Unit-tests-fixes-for-2016.3.2.patch
 Patch19:        0019-Fix-snapper_test-for-python26.patch
 # PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36263
 Patch20:        0020-Integration-tests-fixes-for-2016.3.2.patch
+# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36495
+Patch21:        0021-Fix-pkg.upgrade-for-zypper.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -459,20 +462,6 @@ Zsh command line completion support for %{name}.
 
 %endif
 
-%if 0%{?suse_version}
-%package susemanager
-Summary:        SUSE Manager Integration
-Group:          System/Management
-Requires:       %{name} = %{version}-%{release}
-%if 0%{?suse_version} > 1110
-BuildArch:      noarch
-%endif
-
-%description susemanager
-SUSE Manager Integration for various tools on the system.
-
-%endif
-
 %prep
 %setup -q -n salt-%{version}
 cp %{S:1} .
@@ -559,7 +548,7 @@ install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/pki/minion
 ## Install Zypper plugins only on SUSE machines
 %if 0%{?suse_version}
 install -Dd -m 0750 %{buildroot}%{_prefix}/lib/zypp/plugins/commit
-%{__install} scripts/zypper/plugins/commit/susemanager %{buildroot}%{_prefix}/lib/zypp/plugins/commit/susemanager
+%{__install} scripts/zypper/plugins/commit/zyppnotify %{buildroot}%{_prefix}/lib/zypp/plugins/commit/zyppnotify
 %endif
 
 ## install init and systemd scripts
@@ -904,6 +893,11 @@ fi
 #%dir %ghost        %attr(0750, root, salt) %{_localstatedir}/run/salt/minion
 %{_sbindir}/rcsalt-minion
 
+# Install plugin only on SUSE machines
+%if 0%{?suse_version}
+%{_prefix}/lib/zypp/plugins/commit/zyppnotify
+%endif
+
 %if %{with systemd}
 %{_unitdir}/salt-minion.service
 %else
@@ -1015,11 +1009,4 @@ fi
 %dir %{fish_dir}
 %endif
 
-# Install plugin only on SUSE machines
-%if 0%{?suse_version}
-%files susemanager
-%defattr(-,root,root)
-%{_prefix}/lib/zypp/plugins/commit/susemanager
-%endif
-
 %changelog