diff --git a/contextvars.patch b/contextvars.patch index 380e21c..ecfa21b 100644 --- a/contextvars.patch +++ b/contextvars.patch @@ -6,13 +6,15 @@ distro>=1.0.1 -contextvars psutil>=5.0.0 ---- 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 @@ +--- salt-3005.2/requirements/zeromq.txt~ 2023-08-03 12:27:49.000000000 -0500 ++++ salt-3005.2/requirements/zeromq.txt 2023-09-05 15:00:22.172125782 -0500 +@@ -1,8 +1,4 @@ -r base.txt -r crypto.txt --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>19.0.2 ; python_version >= "3.9" -+pyzmq>=19.0.2 +-pyzmq<=20.0.0; python_version < "3.6" +-pyzmq>=20.0.0; python_version >= "3.6" +-# We can't use 23+ on Windows until they fix this: +-# https://github.com/zeromq/pyzmq/issues/1472 +-pyzmq>=20.0.0,<=22.0.3 ; sys_platform == "win32" ++pyzmq>=20.0.0 diff --git a/salt.spec b/salt.spec index b64ebe0..7e8df49 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: 3005.1%{?__rc_ver} -Release: 2%{?dist} +Version: 3005.2 +Release: 1%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: ASL 2.0 @@ -53,7 +53,7 @@ Requires: logrotate BuildRequires: systemd-rpm-macros BuildRequires: python3-devel - +BuildRequires: python3-toml %description Salt is a distributed remote execution system used to execute commands and @@ -317,6 +317,9 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name} %changelog +* Tue Sep 05 2023 Gwyn Ciesla - 3005.2-1 +- 3005.2 + * Mon Oct 10 2022 Robby Callicotte - 3005.1-2 - Removed macros from changelog diff --git a/sources b/sources index 1bbaa3a..6216711 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (salt-3005.1.tar.gz) = 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50 +SHA512 (salt-3005.2.tar.gz) = 07e7afc732a97006557d4556d60aa1854934893d0566bf8c295d4b1c01515988a1bf2798ce228f6b37e657de8fdfff51153ad2ea8d54baa6a5c377e30794f317