Accepting request 1142377 from home:PSuarezHernandez:branches:systemsmanagement:saltstack

- Provide user(salt)/group(salt) capabilities for RPM 4.19

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

salt.spec

@@ -357,6 +357,8 @@ Obsoletes:      python2-%{name}
 
 Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
+Provides:       user(salt)
+Provides:       group(salt)
 
 %if 0%{?suse_version}
 Requires(pre):  %fillup_prereq
@@ -697,30 +699,12 @@ Requires(pre):  %fillup_prereq
 Salt ssh is a master running without zmq.
 it enables the management of minions over a ssh connection.
 
-%package -n python3-salt-testsuite
+%package tests
 Summary:        Unit and integration tests for Salt
 Requires:       %{name} = %{version}-%{release}
-Requires:       python3-CherryPy
-Requires:       python3-Genshi
-Requires:       python3-Mako
-%if !0%{?suse_version} > 1600 || 0%{?centos}
-Requires:       python3-boto
-%endif
-Requires:       python3-boto3
-Requires:       python3-docker
-Requires:       python3-mock
-Requires:       python3-pygit2
-Requires:       python3-pytest >= 7.0.1
-Requires:       python3-pytest-httpserver
-Requires:       python3-pytest-salt-factories >= 1.0.0~rc21
-Requires:       python3-pytest-subtests
-Requires:       python3-testinfra
-Requires:       python3-yamllint
 
-Obsoletes:      %{name}-tests
-
-%description -n python3-salt-testsuite
-Collection of unit, functional, and integration tests for %{name}.
+%description tests
+Collections of unit and integration tests for Salt
 
 %if %{with bash_completion}
 %package bash-completion
@@ -868,12 +852,10 @@ install -Dd -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d/
 install -Dpm 0644 salt/cli/support/profiles/* %{buildroot}%{python3_sitelib}/salt/cli/support/profiles
 
 # Install Salt tests
-install -Dd %{buildroot}%{python3_sitelib}/salt-testsuite
-cp -a tests %{buildroot}%{python3_sitelib}/salt-testsuite/
-# Remove runtests.py which is not used as deprecated method of running the tests
-rm %{buildroot}%{python3_sitelib}/salt-testsuite/tests/runtests.py
-# Copy conf files to the testsuite as they are used by the tests
-cp -a conf %{buildroot}%{python3_sitelib}/salt-testsuite/
+install -Dd -m 0750 %{buildroot}%{_datadir}/salt
+install -Dd -m 0750 %{buildroot}%{_datadir}/salt/tests
+cp -a tests/* %{buildroot}%{_datadir}/salt/tests/
+sed -i '1s=^#!/usr/bin/\(python\|env python\)[0-9.]*=#!/usr/bin/python3=' %{buildroot}%{_datadir}/salt/tests/runtests.py
 
 ## Install Zypper plugins only on SUSE machines
 %if 0%{?suse_version}
@@ -1450,10 +1432,7 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
 
 %files -n python3-salt
 %defattr(-,root,root,-)
-%dir %{python3_sitelib}/salt
-%dir %{python3_sitelib}/salt-*.egg-info
-%{python3_sitelib}/salt/*
-%{python3_sitelib}/salt-*.egg-info/*
+%{python3_sitelib}/*
 %exclude %{python3_sitelib}/salt/cloud/deploy/*.sh
 
 %if %{with docs}
@@ -1462,8 +1441,10 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
 %doc doc/_build/html
 %endif
 
-%files -n python3-salt-testsuite
-%{python3_sitelib}/salt-testsuite
+%files tests
+%dir %{_datadir}/salt/
+%dir %{_datadir}/salt/tests/
+%{_datadir}/salt/tests/*
 
 %if %{with bash_completion}
 %files bash-completion