diff --git a/contextvars.patch b/contextvars.patch index 396e12d..380e21c 100644 --- a/contextvars.patch +++ b/contextvars.patch @@ -1,20 +1,18 @@ -diff -up salt-3004.2/requirements/base.txt.fix salt-3004.2/requirements/base.txt ---- salt-3004.2/requirements/base.txt.fix 2022-07-11 09:43:29.460966391 -0500 -+++ salt-3004.2/requirements/base.txt 2022-07-11 09:43:41.718365776 -0500 +--- salt-3005/requirements/base.txt.fix 2022-08-25 17:13:58.740984435 -0600 ++++ salt-3005/requirements/base.txt 2022-08-25 17:14:14.428036445 -0600 @@ -4,5 +4,4 @@ PyYAML MarkupSafe requests>=1.0.0 distro>=1.0.1 -contextvars psutil>=5.0.0 -diff -up salt-3004.2/requirements/zeromq.txt.fix salt-3004.2/requirements/zeromq.txt ---- salt-3004.2/requirements/zeromq.txt.fix 2022-07-11 09:44:05.438138660 -0500 -+++ salt-3004.2/requirements/zeromq.txt 2022-07-11 09:45:00.889023236 -0500 +--- salt-3005/requirements/zeromq.txt.fix 2022-08-25 17:05:45.496349067 -0600 ++++ salt-3005/requirements/zeromq.txt 2022-08-25 17:06:19.011460188 -0600 @@ -1,6 +1,4 @@ -r base.txt -r crypto.txt -pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9" --pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9" -+pyzmq>=17.0.0 +-pyzmq>=17.0.0 ; python_version < "3.9" +-pyzmq>19.0.2 ; python_version >= "3.9" ++pyzmq>=19.0.2 diff --git a/salt.spec b/salt.spec index 53d8b5f..acf8ff4 100644 --- a/salt.spec +++ b/salt.spec @@ -10,8 +10,8 @@ %global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) Name: salt -Version: 3004.2%{?__rc_ver} -Release: 3%{?dist} +Version: 3005%{?__rc_ver} +Release: 1%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: ASL 2.0 @@ -231,13 +231,11 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name} %doc %{_mandir}/man1/%{name}-key.1* %doc %{_mandir}/man1/%{name}-master.1* %doc %{_mandir}/man1/%{name}-run.1* -%doc %{_mandir}/man1/%{name}-unity.1* %{_bindir}/%{name} %{_bindir}/%{name}-cp %{_bindir}/%{name}-key %{_bindir}/%{name}-master %{_bindir}/%{name}-run -%{_bindir}/%{name}-unity %{_unitdir}/%{name}-master.service %config(noreplace) %{_sysconfdir}/%{name}/master %config(noreplace) %{_sysconfdir}/%{name}/master.d @@ -319,6 +317,9 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name} %changelog +* Thu Aug 25 2022 Salt Project Packaging - 3005-1 +- Update to feature release 3005-1 for Python 3 + * Thu Jul 28 2022 Robby Callicotte - 3004.2-3 - Cleaned up specfile diff --git a/sources b/sources index d68d2ae..946d0ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-3004.2.tar.gz) = b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef +SHA512 (salt-3005.tar.gz) = c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18