rpm/salt
SHA256
1
0
Fork 0
forked from pool/salt
Code Pull Requests Activity

osc copypac from project:systemsmanagement:saltstack:testing package:salt revision:312

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=157
This commit is contained in:
Pablo Suárez Hernández
2019-12-10 15:22:43 +00:00
committed by Git OBS Bridge
parent 51d9b78cf8
commit a8810c88a2
8 changed files with 323 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
salt.spec
View File

@@ -261,6 +261,15 @@ Patch90: read-repo-info-without-using-interpolation-bsc-11356.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/53293
Patch91: prevent-test_mod_del_repo_multiline_values-to-fail.patch
Patch92: fix-for-log-checking-in-x509-test.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/190
Patch93: fixing-streamclosed-issue.patch
Patch94: fix-batch_async-obsolete-test.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/191
Patch95: let-salt-ssh-use-platform-python-binary-in-rhel8-191.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/192
Patch96: align-virt-full-info-fixes-with-upstream-192.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/55351
Patch97: fix-virt.get_hypervisor-188.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
@@ -869,15 +878,20 @@ cp %{S:5} ./.travis.yml
%patch90 -p1
%patch91 -p1
%patch92 -p1
%patch93 -p1
%patch94 -p1
%patch95 -p1
%patch96 -p1
%patch97 -p1
%build
%if 0%{?build_py2}
%{__python} setup.py --with-salt-version=%{version} --salt-transport=both build
python setup.py --with-salt-version=%{version} --salt-transport=both build
cp ./build/lib/salt/_version.py ./salt
mv build _build.python2
%endif
%if 0%{?build_py3}
%{__python3} setup.py --with-salt-version=%{version} --salt-transport=both build
python3 setup.py --with-salt-version=%{version} --salt-transport=both build
cp ./build/lib/salt/_version.py ./salt
mv build _build.python3
%endif
@@ -898,12 +912,12 @@ cd doc && make html && rm _build/html/.buildinfo && rm _build/html/_images/proxy
%install
%if 0%{?build_py2}
mv _build.python2 build
%{__python} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
python setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
mv build _build.python2
%endif
%if 0%{?build_py3}
mv _build.python3 build
%{__python3} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
python3 setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
mv build _build.python3
%endif
@@ -1069,9 +1083,9 @@ install -Dpm 0640 conf/suse/standalone-formulas-configuration.conf %{buildroot}%
%check
%if %{with test}
%if 0%{?default_py3}
%{__python3} setup.py test --runtests-opts=-u
python3 setup.py test --runtests-opts=-u
%else
%{__python} setup.py test --runtests-opts=-u
python setup.py test --runtests-opts=-u
%endif
%endif