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:297

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=152
This commit is contained in:
Pablo Suárez Hernández
2019-10-10 11:49:11 +00:00
committed by Git OBS Bridge
parent db75446e33
commit b39fec6a59
8 changed files with 424 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
salt.spec
View File

@@ -14,6 +14,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%global debug_package %{nil}
%if 0%{?suse_version} >= 1320
# SLE15
@@ -243,8 +244,18 @@ Patch82: virt.volume_infos-silence-libvirt-error-message-175.patch
Patch83: fix-virt.full_info-176.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/002543df392f65d95dbc127dc058ac897f2035ed
Patch84: improve-batch_async-to-release-consumed-memory-bsc-1.patch
# PATCH_FIX_UPSTREAM: https://github.com/saltstack/salt/pull/54770
Patch85: take-checksums-arg-into-account-for-postgres.datadir.patch
# PATCH_FIX_UPSTREAM: https://github.com/saltstack/salt/pull/54077
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/44a91c2ce6df78d93ce0ef659dedb0e41b1c2e04
Patch86: prevent-systemd-run-description-issue-when-running-a.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/55d8a777d6a9b19c959e14a4060e5579e92cd106
Patch87: use-current-ioloop-for-the-localclient-instance-of-b.patch
# PATCH_FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/8378bb24a5a53973e8dba7658b8b3465d967329f
Patch88: fix-failing-unit-tests-for-batch-async.patch
# PATCH_FIX_UPSTREAM: https://github.com/saltstack/salt/pull/54935
Patch89: add-missing-fun-for-returns-from-wfunc-executions.patch
# BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
%if 0%{?suse_version} > 1020
@@ -424,12 +435,18 @@ BuildRequires: python3-devel
# requirements/base.txt
%if 0%{?rhel}
BuildRequires: python3-jinja2
BuildRequires: python3-markupsafe
BuildRequires: python3-msgpack > 0.3
BuildRequires: python3-zmq >= 2.2.0
BuildRequires: python3-m2crypto
%else
BuildRequires: python3-Jinja2
%endif
BuildRequires: python3-MarkupSafe
BuildRequires: python3-PyYAML
BuildRequires: python3-msgpack-python > 0.3
BuildRequires: python3-pyzmq >= 2.2.0
BuildRequires: python3-pycrypto >= 2.6.1
%endif
BuildRequires: python3-PyYAML
BuildRequires: python3-psutil
BuildRequires: python3-requests >= 1.0.0
BuildRequires: python3-tornado >= 4.2.1
@@ -437,8 +454,6 @@ BuildRequires: python3-tornado >= 4.2.1
BuildConflicts: python3-tornado >= 5
# requirements/zeromq.txt
BuildRequires: python3-pycrypto >= 2.6.1
BuildRequires: python3-pyzmq >= 2.2.0
%if %{with test}
# requirements/dev_python27.txt
BuildRequires: python3-boto >= 2.32.1
@@ -461,15 +476,24 @@ Requires: python3-certifi
%if 0%{?rhel}
Requires: python3-jinja2
Requires: yum
Requires: python3-markupsafe
Requires: python3-msgpack > 0.3
Requires: python3-m2crypto
Requires: python3-zmq >= 2.2.0
%if 0%{?rhel} == 8
Requires: dnf
%endif
%if 0%{?rhel} == 6
Requires: yum-plugin-security
%endif
%else
Requires: python3-Jinja2
%endif
Requires: python3-MarkupSafe
Requires: python3-PyYAML
Requires: python3-msgpack-python > 0.3
Requires: python3-pycrypto >= 2.6.1
Requires: python3-pyzmq >= 2.2.0
%endif
Requires: python3-PyYAML
Requires: python3-psutil
Requires: python3-requests >= 1.0.0
Requires: python3-tornado >= 4.2.1
@@ -486,8 +510,6 @@ Suggests: python3-timelib
Suggests: python3-gnupg
# requirements/zeromq.txt
%endif
Requires: python3-pycrypto >= 2.6.1
Requires: python3-pyzmq >= 2.2.0
#
%if 0%{?suse_version}
# python-xml is part of python-base in all rhel versions
@@ -805,6 +827,11 @@ cp %{S:5} ./.travis.yml
%patch82 -p1
%patch83 -p1
%patch84 -p1
%patch85 -p1
%patch86 -p1
%patch87 -p1
%patch88 -p1
%patch89 -p1
%build
%if 0%{?build_py2}
@@ -1311,10 +1338,12 @@ fi
%endif
%endif
%if 0%{?build_py2}
%posttrans -n python2-salt
# force re-generate a new thin.tgz
rm -f %{_localstatedir}/cache/salt/master/thin/version
rm -f %{_localstatedir}/cache/salt/minion/thin/version
%endif
%if 0%{?build_py3}
%posttrans -n python3-salt
@@ -1345,10 +1374,8 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%config(noreplace) %attr(0640, root, salt) %{_sysconfdir}/salt/cloud.providers
%dir %attr(0750, root, salt) %{_localstatedir}/cache/salt/cloud
%if 0%{?default_py3}
%{python3_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
%attr(755,root,root)%{python3_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
%else
%{python_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
%attr(755,root,root)%{python_sitelib}/salt/cloud/deploy/bootstrap-salt.sh
%endif
%{_mandir}/man1/salt-cloud.1.*
@@ -1378,7 +1405,6 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%dir %attr(0750, root, root) %{_sysconfdir}/salt/minion.d/
%dir %attr(0750, root, root) %{_sysconfdir}/salt/pki/minion/
%dir %attr(0750, root, root) %{_localstatedir}/cache/salt/minion/
#%dir %ghost %attr(0750, root, salt) %{_localstatedir}/run/salt/minion
%{_sbindir}/rcsalt-minion
# Install plugin only on SUSE machines
@@ -1450,7 +1476,6 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/roots/
%dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/syndics/
%dir %attr(0750, salt, salt) %{_localstatedir}/cache/salt/master/tokens/
#%dir %ghost %attr(0750, salt, salt) %{_localstatedir}/run/salt/master/
%files
%defattr(-,root,root,-)
@@ -1473,7 +1498,6 @@ rm -f %{_localstatedir}/cache/salt/minion/thin/version
%dir %attr(0750, root, salt) %{_sysconfdir}/salt/pki
%dir %attr(0750, salt, salt) %{_localstatedir}/log/salt
%dir %attr(0750, root, salt) %{_localstatedir}/cache/salt
#%dir %ghost %attr(0750, root, salt) %{_localstatedir}/run/salt
%dir %attr(0750, root, salt) /srv/spm
%if %{with systemd}
/usr/lib/tmpfiles.d/salt.conf