From 84958e02326e61faae98e57097bb076219f04ee6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 2 Oct 2024 07:33:52 -0400 Subject: [PATCH 1/3] Rebuilt with rust-brotli 7.0.0 From bcf64cfb0ee4f02b7690e82603b7cc0a90284e6c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 16 Oct 2024 07:32:01 -0400 Subject: [PATCH 2/3] Revert "Fix automatic provides on Python extension due to SONAME" - The root cause is fixed in rust-1.81.0-4 and later. This reverts commit 5d92fffdd308841a81bfbb5ee9a4a4fe8a656813. --- python-cramjam.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/python-cramjam.spec b/python-cramjam.spec index 0510bc6..747b5fb 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -19,13 +19,6 @@ BuildRequires: python3-devel BuildRequires: tomcli BuildRequires: cargo-rpm-macros >= 24 -# The Python extension module now gets a SONAME of libcramjam.so; we -# must ensure it is not used to generate automatic Provides. See: -# Rust 1.81+ implicitly / automatically sets soname on cdylib targets -# https://bugzilla.redhat.com/show_bug.cgi?id=2314879 -# https://docs.fedoraproject.org/en-US/packaging-guidelines/AutoProvidesAndRequiresFiltering/#_filtering_provides_and_requires_after_scanning -%global __provides_exclude ^libcramjam\\.so.*$ - %global common_description %{expand: %{summary}.} From b60f82044159519dfe1b14b8d7672a58d59deb15 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 3 Jan 2025 09:32:11 -0500 Subject: [PATCH 3/3] Patch for maturin 1.8.0 --- ...version-key-in-the-project-table-196.patch | 24 +++++++++++++++++++ python-cramjam.spec | 7 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-Add-a-version-key-in-the-project-table-196.patch diff --git a/0001-Add-a-version-key-in-the-project-table-196.patch b/0001-Add-a-version-key-in-the-project-table-196.patch new file mode 100644 index 0000000..1c6896b --- /dev/null +++ b/0001-Add-a-version-key-in-the-project-table-196.patch @@ -0,0 +1,24 @@ +From c38f51baa2c74fa89d5a4de6983b9681e5ccc5ff Mon Sep 17 00:00:00 2001 +From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> +Date: Tue, 31 Dec 2024 00:19:35 +0530 +Subject: [PATCH] Add a `version` key in the `[project]` table (#196) + +--- + cramjam-python/pyproject.toml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cramjam-python/pyproject.toml b/cramjam-python/pyproject.toml +index 2a4aa85..4c19e03 100644 +--- a/cramjam-python/pyproject.toml ++++ b/cramjam-python/pyproject.toml +@@ -2,6 +2,7 @@ + name = "cramjam" + keywords = ["compression", "decompression", "snappy", "zstd", "bz2", "gzip", "lz4", "brotli", "deflate"] + requires-python = ">=3.7" ++version = "2.8.3" + license = { file = "LICENSE" } + + [project.urls] +-- +2.47.1 + diff --git a/python-cramjam.spec b/python-cramjam.spec index 747b5fb..7df2c1f 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -15,6 +15,11 @@ URL: https://github.com/milesgranger/cramjam # the GitHub source archive. Source: %{url}/archive/v%{version}/cramjam-%{version}.tar.gz +# Updates for Maturin 1.8: add a version key in the project metadata +# https://github.com/milesgranger/cramjam/pull/196 +# Cherry-picked to 2.8.3. +Patch: 0001-Add-a-version-key-in-the-project-table-196.patch + BuildRequires: python3-devel BuildRequires: tomcli BuildRequires: cargo-rpm-macros >= 24 @@ -48,7 +53,7 @@ License: %{shrink: %prep -%autosetup -n cramjam-%{version} +%autosetup -n cramjam-%{version} -p1 # Do not strip the compiled Python module; we need useful debuginfo. Upstream # set this intentionally, so this makes sense to keep downstream-only.