diff --git a/.gitignore b/.gitignore index 59c9ea3..dab65bf 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /orjson-3.9.7.tar.gz /orjson-3.9.8.tar.gz /orjson-3.9.10.tar.gz +/orjson-3.9.12.tar.gz diff --git a/cb94db294e628f3a9d1ee3e7c54e3df41daff393.patch b/cb94db294e628f3a9d1ee3e7c54e3df41daff393.patch new file mode 100644 index 0000000..5b1790a --- /dev/null +++ b/cb94db294e628f3a9d1ee3e7c54e3df41daff393.patch @@ -0,0 +1,22 @@ +From cb94db294e628f3a9d1ee3e7c54e3df41daff393 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 18 Jan 2024 15:31:54 -0500 +Subject: [PATCH] Use the current verison of ahash, 0.8.7 + +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index c2cf4578..d16b88d0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -45,7 +45,7 @@ no-panic = [ + yyjson = [] + + [dependencies] +-ahash = { version = "=0.8.6", default_features = false, features = ["compile-time-rng"] } ++ahash = { version = "=0.8.7", default_features = false, features = ["compile-time-rng"] } + arrayvec = { version = "0.7", default_features = false, features = ["std", "serde"] } + associative-cache = { version = "2", default_features = false } + beef = { version = "0.5", default_features = false, features = ["impl_serde"] } diff --git a/python-orjson.spec b/python-orjson.spec index bcad5d6..10f16ea 100644 --- a/python-orjson.spec +++ b/python-orjson.spec @@ -8,7 +8,7 @@ %bcond tests 1 Name: python-orjson -Version: 3.9.10 +Version: 3.9.12 Release: 1%{?dist} Summary: Fast, correct Python JSON library @@ -16,6 +16,10 @@ License: Apache-2.0 OR MIT URL: https://github.com/ijl/orjson Source: %{pypi_source orjson} +# Use the current verison of ahash, 0.8.7 +# https://github.com/ijl/orjson/pull/451 +Patch: %{url}/pull/451/commits/cb94db294e628f3a9d1ee3e7c54e3df41daff393.patch + BuildRequires: tomcli BuildRequires: python3-devel BuildRequires: %{py3_dist pytest-forked} @@ -32,14 +36,15 @@ datetimes, and numpy} %package -n python3-orjson Summary: %{summary} # (Apache-2.0 OR MIT) AND BSD-3-Clause -# Apache-2.0 # Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT +# BSD-2-Clause OR Apache-2.0 OR MIT # MIT +# MIT OR Apache-2.0 License: %{shrink: (Apache-2.0 OR MIT) AND BSD-3-Clause AND - Apache-2.0 AND + (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND MIT } @@ -94,6 +99,9 @@ export RUSTFLAGS='%{build_rustflags}' %changelog +* Thu Jan 18 2024 Benjamin A. Beasley - 3.9.12-1 +- Update to 3.9.12. Fixes rhbz#2259025 + * Wed Nov 22 2023 Maxwell G - 3.9.10-1 - Update to 3.9.10. Fixes rhbz#2243767. diff --git a/sources b/sources index 19aef9a..627365a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orjson-3.9.10.tar.gz) = 070bbee45ec08b1496b0f92d5b36d278000e33f00af6e45f2857b97c14682887558ca6413789cfebfc96a29d2366be0832a01e5e9a69868ab66d2907f86d999a +SHA512 (orjson-3.9.12.tar.gz) = b2689d92b34b6c818e5a798e6de08d693e3a6b04f205d943fb8960727153635faf7118d33ea78a79ce09aa0b066b07d431b27871a61a8de536f64a80f6bab387