diff --git a/.gitignore b/.gitignore index bbba7f4..8933129 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cramjam-2.9.0.tar.gz /cramjam-2.9.1.tar.gz /cramjam-61564e7761e38e5ec55e7939ccd6a276c2c55d11-filtered.tar.gz +/cramjam-cdc7d307d0f592f89b3319a7037fd875a5371ef3-filtered.tar.gz diff --git a/203.patch b/203.patch new file mode 100644 index 0000000..90989ec --- /dev/null +++ b/203.patch @@ -0,0 +1,22 @@ +From 06a941b8f1c8a96193a6db3a932f6978e218aad0 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Mon, 24 Feb 2025 14:46:13 -0500 +Subject: [PATCH] Bump libcramjam -> 0.7 (in Cargo.toml, to match Cargo.lock) + +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 8aa745e7..cf64bfb6 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -66,7 +66,7 @@ wasm32-compat = ["libcramjam/wasm32-compat"] + + [dependencies] + pyo3 = { version = "^0.23", default-features = false, features = ["macros"] } +-libcramjam = { version = "^0.6", default-features = false } ++libcramjam = { version = "^0.7", default-features = false } + + [build-dependencies] + pyo3-build-config = "^0.23" diff --git a/python-cramjam.spec b/python-cramjam.spec index 060645e..7d70c72 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -1,7 +1,7 @@ %bcond tests 1 -%global commit 61564e7761e38e5ec55e7939ccd6a276c2c55d11 -%global snapdate 20250104 +%global commit cdc7d307d0f592f89b3319a7037fd875a5371ef3 +%global snapdate 20250222 Name: python-cramjam Version: 2.10.0~%{snapdate}git%{sub %{commit} 1 7} @@ -33,6 +33,10 @@ Source1: get_source %endif +# Bump libcramjam -> 0.7 (in Cargo.toml, to match Cargo.lock) +# https://github.com/milesgranger/cramjam/pull/203 +Patch: %{url}/pull/203.patch + BuildRequires: python3-devel BuildRequires: tomcli BuildRequires: cargo-rpm-macros >= 24 diff --git a/sources b/sources index 2b5c828..6823acd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cramjam-61564e7761e38e5ec55e7939ccd6a276c2c55d11-filtered.tar.gz) = 2c0eaafaa63b1a0c65ba217a77c13ae71871c73e67466ea9bb86ca169e7c42af744ffb48e27294824350137297ee40c9ddd0a61a1290ce48b9ea18de2fbcdb1f +SHA512 (cramjam-cdc7d307d0f592f89b3319a7037fd875a5371ef3-filtered.tar.gz) = 913310ecd2541db0c7cc1232d53b9eb866573a91d87c7be505c7360f7276a0c9484b02232d0364aa531c059252f549acf49b0cc7c468ca638b7adaff73a8abaa