diff --git a/salt-3001-msgpack-zmq.patch b/salt-3001-msgpack-zmq.patch new file mode 100644 index 0000000..ecdd34d --- /dev/null +++ b/salt-3001-msgpack-zmq.patch @@ -0,0 +1,22 @@ +diff -Naur a/requirements/base.txt b/requirements/base.txt +--- a/requirements/base.txt 2020-06-02 15:42:02.000000000 -0600 ++++ b/requirements/base.txt 2020-06-03 12:09:35.534741001 -0600 +@@ -1,5 +1,6 @@ + Jinja2 +-msgpack>=0.5,!=0.5.5,<1.0.0 ++## msgpack>=0.5,!=0.5.5,<1.0.0 ++msgpack>=0.5.6 + PyYAML + MarkupSafe + requests>=1.0.0 +diff -Naur a/requirements/zeromq.txt b/requirements/zeromq.txt +--- a/requirements/zeromq.txt 2020-06-02 15:42:02.000000000 -0600 ++++ b/requirements/zeromq.txt 2020-06-03 12:10:00.205931146 -0600 +@@ -1,5 +1,5 @@ + -r base.txt + -r crypto.txt + +-pyzmq>=2.2.0; python_version < '3.8' +-pyzmq>=19.0.0; python_version >= '3.8' ++pyzmq>=17.0.0; python_version < '3.8' ++pyzmq>=17.0.0; python_version >= '3.8' diff --git a/salt.spec b/salt.spec index 0f48f38..9ee90e5 100644 --- a/salt.spec +++ b/salt.spec @@ -19,7 +19,7 @@ Name: salt Version: 3001rc1%{?__rc_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: ASL 2.0 @@ -47,11 +47,7 @@ Source19: salt-minion.fish Source20: salt-run.fish 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 +Patch: salt-3001-msgpack-zmq.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -99,7 +95,7 @@ Requires: python%{python3_pkgversion}-distro %endif Requires: python%{python3_pkgversion}-jinja2 -Requires: python%{python3_pkgversion}-msgpack >= 0.6.2 +Requires: python%{python3_pkgversion}-msgpack >= 0.5.6 Requires: python%{python3_pkgversion}-pycryptodomex >= 3.7 Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-zmq @@ -203,11 +199,7 @@ Supports Python 3. ## %%autosetup %setup -q -c cd %{name}-%{version} -## %%if 0%%{?rhel} > 7 -## %%patch0 -p1 -## %%endif -## %%patch1 -p1 -## %%patch2 -p1 +%patch0 -p1 %if %{with python3} rm -rf %{py3dir} @@ -503,6 +495,9 @@ rm -rf %{buildroot} %changelog +* Wed Jun 03 2020 SaltStack Packaging Team - 3001rc1-2 +- Altered msgpack and python-zmq versions limitation + * Tue Jun 02 2020 SaltStack Packaging Team - 3001rc1-1 - Update to Release Candidate rc1 for point release 3001