|
|
@ -18,8 +18,8 @@
|
|
|
|
%define fish_dir %{_datadir}/fish/vendor_functions.d
|
|
|
|
%define fish_dir %{_datadir}/fish/vendor_functions.d
|
|
|
|
|
|
|
|
|
|
|
|
Name: salt
|
|
|
|
Name: salt
|
|
|
|
Version: 3000.3%{?__rc_ver}
|
|
|
|
Version: 3001rc1%{?__rc_ver}
|
|
|
|
Release: 2%{?dist}
|
|
|
|
Release: 1%{?dist}
|
|
|
|
Summary: A parallel remote execution system
|
|
|
|
Summary: A parallel remote execution system
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
Group: System Environment/Daemons
|
|
|
|
License: ASL 2.0
|
|
|
|
License: ASL 2.0
|
|
|
@ -50,8 +50,8 @@ Source21: salt-syndic.fish
|
|
|
|
## %%if 0%%{?rhel} > 7
|
|
|
|
## %%if 0%%{?rhel} > 7
|
|
|
|
## Patch0: salt-py3-2019.2.2-tornado4.patch
|
|
|
|
## Patch0: salt-py3-2019.2.2-tornado4.patch
|
|
|
|
## %%endif
|
|
|
|
## %%endif
|
|
|
|
Patch1: salt-py3-2019.2.1-rpmsign.patch
|
|
|
|
## Patch1: salt-py3-2019.2.1-rpmsign.patch
|
|
|
|
Patch2: salt-m2_requirements.patch
|
|
|
|
## Patch2: salt-m2_requirements.patch
|
|
|
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
BuildArch: noarch
|
|
|
|
BuildArch: noarch
|
|
|
@ -99,13 +99,8 @@ Requires: python%{python3_pkgversion}-distro
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-jinja2
|
|
|
|
Requires: python%{python3_pkgversion}-jinja2
|
|
|
|
Requires: python%{python3_pkgversion}-msgpack >= 0.4
|
|
|
|
Requires: python%{python3_pkgversion}-msgpack >= 0.6.2
|
|
|
|
|
|
|
|
|
|
|
|
## for dump requirements file
|
|
|
|
|
|
|
|
## Requires: python%%{python3_pkgversion}-crypto >= 2.6.1
|
|
|
|
|
|
|
|
## Requires: python%%{python3_pkgversion}-m2crypto >= 0.31.0
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-pycryptodomex >= 3.7
|
|
|
|
Requires: python%{python3_pkgversion}-pycryptodomex >= 3.7
|
|
|
|
|
|
|
|
|
|
|
|
Requires: python%{python3_pkgversion}-requests
|
|
|
|
Requires: python%{python3_pkgversion}-requests
|
|
|
|
Requires: python%{python3_pkgversion}-zmq
|
|
|
|
Requires: python%{python3_pkgversion}-zmq
|
|
|
|
Requires: python%{python3_pkgversion}-markupsafe
|
|
|
|
Requires: python%{python3_pkgversion}-markupsafe
|
|
|
@ -211,8 +206,8 @@ cd %{name}-%{version}
|
|
|
|
## %%if 0%%{?rhel} > 7
|
|
|
|
## %%if 0%%{?rhel} > 7
|
|
|
|
## %%patch0 -p1
|
|
|
|
## %%patch0 -p1
|
|
|
|
## %%endif
|
|
|
|
## %%endif
|
|
|
|
%patch1 -p1
|
|
|
|
## %%patch1 -p1
|
|
|
|
%patch2 -p1
|
|
|
|
## %%patch2 -p1
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with python3}
|
|
|
|
%if %{with python3}
|
|
|
|
rm -rf %{py3dir}
|
|
|
|
rm -rf %{py3dir}
|
|
|
@ -508,8 +503,8 @@ rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3000.3-2
|
|
|
|
* Tue Jun 02 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3001rc1-1
|
|
|
|
- Rebuilt for Python 3.9
|
|
|
|
- Update to Release Candidate rc1 for point release 3001
|
|
|
|
|
|
|
|
|
|
|
|
* Fri May 15 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000.3-1
|
|
|
|
* Fri May 15 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000.3-1
|
|
|
|
- Update to feature release 3000.3-1 for Python 3
|
|
|
|
- Update to feature release 3000.3-1 for Python 3
|
|
|
|