diff --git a/.gitignore b/.gitignore index 781c224..e415ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /salt-3000.1.tar.gz /salt-3000.2.tar.gz /salt-3000.3.tar.gz +/salt-3001rc1.tar.gz diff --git a/salt.spec b/salt.spec index 1f66990..0f48f38 100644 --- a/salt.spec +++ b/salt.spec @@ -18,8 +18,8 @@ %define fish_dir %{_datadir}/fish/vendor_functions.d Name: salt -Version: 3000.3%{?__rc_ver} -Release: 2%{?dist} +Version: 3001rc1%{?__rc_ver} +Release: 1%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: ASL 2.0 @@ -50,8 +50,8 @@ Source21: salt-syndic.fish ## %%if 0%%{?rhel} > 7 ## Patch0: salt-py3-2019.2.2-tornado4.patch ## %%endif -Patch1: salt-py3-2019.2.1-rpmsign.patch -Patch2: salt-m2_requirements.patch +## Patch1: salt-py3-2019.2.1-rpmsign.patch +## Patch2: salt-m2_requirements.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -99,13 +99,8 @@ Requires: python%{python3_pkgversion}-distro %endif Requires: python%{python3_pkgversion}-jinja2 -Requires: python%{python3_pkgversion}-msgpack >= 0.4 - -## for dump requirements file -## Requires: python%%{python3_pkgversion}-crypto >= 2.6.1 -## Requires: python%%{python3_pkgversion}-m2crypto >= 0.31.0 +Requires: python%{python3_pkgversion}-msgpack >= 0.6.2 Requires: python%{python3_pkgversion}-pycryptodomex >= 3.7 - Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-zmq Requires: python%{python3_pkgversion}-markupsafe @@ -211,8 +206,8 @@ cd %{name}-%{version} ## %%if 0%%{?rhel} > 7 ## %%patch0 -p1 ## %%endif -%patch1 -p1 -%patch2 -p1 +## %%patch1 -p1 +## %%patch2 -p1 %if %{with python3} rm -rf %{py3dir} @@ -508,8 +503,8 @@ rm -rf %{buildroot} %changelog -* Tue May 26 2020 Miro HronĨok - 3000.3-2 -- Rebuilt for Python 3.9 +* Tue Jun 02 2020 SaltStack Packaging Team - 3001rc1-1 +- Update to Release Candidate rc1 for point release 3001 * Fri May 15 2020 SaltStack Packaging Team - 3000.3-1 - Update to feature release 3000.3-1 for Python 3 diff --git a/sources b/sources index 473441d..7581b90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-3000.3.tar.gz) = a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208 +SHA512 (salt-3001rc1.tar.gz) = ddfa0ffdb9aee4455b54cd4562101a145712b6113eca7f76a9f9f18be92cac1733db7c3f5afb95380f6d725a5479e4d9ff18ff5089f362e31b18b064d8b5d5a6