diff --git a/.gitignore b/.gitignore index 8dd1c89..ca21e64 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /salt-3002.5.tar.gz /salt-3002.6.tar.gz /salt-3003.tar.gz +/salt-3003.1.tar.gz diff --git a/contextvars.patch b/contextvars.patch new file mode 100644 index 0000000..175a1f7 --- /dev/null +++ b/contextvars.patch @@ -0,0 +1,10 @@ +diff -Nar -u0 a/requirements/base.txt b/requirements/base.txt +--- a/requirements/base.txt 2021-06-09 14:25:03.000000000 +0000 ++++ b/requirements/base.txt 2021-06-23 18:36:51.108332870 +0000 +@@ -7 +6,0 @@ +-contextvars +diff -Nar -u0 a/requirements/zeromq.txt b/requirements/zeromq.txt +--- a/requirements/zeromq.txt 2021-06-09 14:25:03.000000000 +0000 ++++ b/requirements/zeromq.txt 2021-07-01 04:19:19.206766098 +0000 +@@ -4 +3,0 @@ +-pyzmq<=20.0.0 ; python_version < "3.6" diff --git a/salt.spec b/salt.spec index 0ec5ce4..eb8a31f 100644 --- a/salt.spec +++ b/salt.spec @@ -15,8 +15,8 @@ %define fish_dir %{_datadir}/fish/vendor_functions.d Name: salt -Version: 3003%{?__rc_ver} -Release: 2%{?dist} +Version: 3003.1%{?__rc_ver} +Release: 1%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: ASL 2.0 @@ -44,6 +44,8 @@ Source19: salt-minion.fish Source20: salt-run.fish Source21: salt-syndic.fish +Patch0: contextvars.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -180,6 +182,8 @@ Supports Python 3. %setup -q -c cd %{name}-%{version} +%patch0 -p1 + rm -rf %{py3dir} cp -a . %{py3dir} @@ -455,6 +459,9 @@ rm -rf %{buildroot} %changelog +* Thu Jul 01 2021 SaltStack Packaging Team - 3003.1-1 +- Update to bugfix release 3003.1-1 for Python 3 + * Fri Jun 04 2021 Python Maint - 3003-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 2eb8327..bc3e96a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-3003.tar.gz) = 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 +SHA512 (salt-3003.1.tar.gz) = bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f