public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-nh3] epel10: Revert to 0.2.x series
@ 2026-08-02 13:07 Mattia Verga
0 siblings, 0 replies; only message in thread
From: Mattia Verga @ 2026-08-02 13:07 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/python-nh3
Branch : epel10
Commit : 58a96522254a59b24efa36b4b587f5e08e9f15d0
Author : Mattia Verga <mattia.verga@proton.me>
Date : 2026-08-02T15:06:40+02:00
Stats : +17/-33 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/python-nh3/c/58a96522254a59b24efa36b4b587f5e08e9f15d0?branch=epel10
Log:
Revert to 0.2.x series
---
diff --git a/.gitignore b/.gitignore
index 7b25af8..7d01e63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,3 @@
/nh3-0.2.19.tar.gz
/nh3-0.2.20.tar.gz
/nh3-0.2.21.tar.gz
-/nh3-0.3.0.tar.gz
-/nh3-0.3.1.tar.gz
-/nh3-0.3.2.tar.gz
-/nh3-0.3.4.tar.gz
diff --git a/do_not_require_win_only_pyo3_extension.patch b/do_not_require_win_only_pyo3_extension.patch
new file mode 100644
index 0000000..8afb1d7
--- /dev/null
+++ b/do_not_require_win_only_pyo3_extension.patch
@@ -0,0 +1,9 @@
+diff -U 3 -dHrN a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml 1970-01-01 01:00:00.000000000 +0100
++++ b/Cargo.toml 2025-03-16 09:25:16.138053179 +0100
+@@ -15,4 +15,4 @@
+
+ [dependencies]
+ ammonia = "4.0.0"
+-pyo3 = { version = "0.23.5", features = ["abi3-py38", "generate-import-lib"] }
++pyo3 = { version = "0.23.5", features = ["abi3-py38"] }
diff --git a/python-nh3.spec b/python-nh3.spec
index e474275..891c3bb 100644
--- a/python-nh3.spec
+++ b/python-nh3.spec
@@ -1,15 +1,13 @@
Name: python-nh3
-Version: 0.3.6
+Version: 0.2.21
Release: %autorelease
Summary: Python binding to Ammonia HTML sanitizer Rust crate
License: MIT
URL: https://github.com/messense/nh3
Source: %{pypi_source nh3}
-# Omit the generate-import-lib feature of the pyo3 dependency, since it is
-# specific to Windows, and we do not package it.
-# Also relax ammonia version requirement
-Patch: rust_deps_relax.patch
+# This disable pyo3 feature requirement specific for windows
+Patch: do_not_require_win_only_pyo3_extension.patch
BuildRequires: cargo-rpm-macros
BuildRequires: python3-devel
@@ -24,16 +22,8 @@ Python binding to Ammonia HTML sanitizer Rust crate.}
%package -n python3-nh3
Summary: %{summary}
-# Rust crates compiled into the executable contribute additional license terms.
-# Full license breakdown in LICENSES.dependencies. To obtain the following
-# list of licenses, build the package and note the output of
-# %%{cargo_license_summary}.
-#
-# Apache-2.0 OR MIT
-# MIT
-# MIT OR Apache-2.0
-# Unicode-3.0
-License: %{license} AND (Apache-2.0 OR MIT) AND Unicode-3.0
+# Full license breakdown in LICENSES.dependencies
+License: MIT AND Apache-2.0 AND (MIT OR Apache-2.0) AND (Zlib OR Apache-2.0 OR MIT)
%description -n python3-nh3 %_description
@@ -59,7 +49,7 @@ export RUSTFLAGS='%{build_rustflags}'
%install
%pyproject_install
-%pyproject_save_files -l nh3
+%pyproject_save_files nh3
%check
@@ -67,6 +57,7 @@ export RUSTFLAGS='%{build_rustflags}'
%files -n python3-nh3 -f %{pyproject_files}
+%license LICENSE LICENSES.dependencies
%doc README.md
diff --git a/rust_deps_relax.patch b/rust_deps_relax.patch
deleted file mode 100644
index 26cd70c..0000000
--- a/rust_deps_relax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml 2006-07-24 03:21:28.000000000 +0200
-+++ b/Cargo.toml 2026-08-02 11:26:23.144838753 +0200
-@@ -14,6 +14,6 @@
- crate-type = ["cdylib"]
-
- [dependencies]
--ammonia = "4.1.2"
--pyo3 = { version = "0.29.0", features = ["abi3-py38", "generate-import-lib"] }
-+ammonia = "4.0"
-+pyo3 = { version = "0.29.0", features = ["abi3-py38"] }
- ouroboros = "0.18"
diff --git a/sources b/sources
index 31caaa3..690e79d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nh3-0.3.6.tar.gz) = a6527724b56fd88ea582b7f64d76727ea3aa2bac2ad53c9539a501439c6955b5e588141522e4d74b49fd862a4cfa7e022a966d3a667d3c77c81a57677bdfd03e
+SHA512 (nh3-0.2.21.tar.gz) = fc6e1cef19fd53d60d5be396ab35715021dfffae9882698ad8d2e3ea3a69e638bcdf125c3202904587683bd17b39361d4e2fbfdb23b5c3a7e4ef268c9e4a5bcb
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-02 13:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-02 13:07 [rpms/python-nh3] epel10: Revert to 0.2.x series Mattia Verga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox