diff --git a/.gitignore b/.gitignore index 042ea88..477366a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ python-Levenshtein-0.10.1.tar.bz2 /Levenshtein-0.23.0.tar.gz /Levenshtein-0.26.0.tar.gz /Levenshtein-0.26.1.tar.gz +/Levenshtein-0.27.1.tar.gz +/Levenshtein-0.27.3.tar.gz diff --git a/72.patch b/72.patch deleted file mode 100644 index 0e6af10..0000000 --- a/72.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f5e782d3efd640be48c59f2b7efa4e19466476a9 Mon Sep 17 00:00:00 2001 -From: Cristian Le -Date: Fri, 28 Feb 2025 13:20:27 +0100 -Subject: [PATCH] fix: pyproject.toml metadata - ---- - pyproject.toml | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pyproject.toml b/pyproject.toml -index 595180d..e424f68 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -26,6 +26,8 @@ classifiers=[ - "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", - ] -+ -+[project.urls] - Homepage = "https://github.com/rapidfuzz/Levenshtein" - Documentation = "https://rapidfuzz.github.io/Levenshtein/" - Repository = "https://github.com/rapidfuzz/Levenshtein.git" diff --git a/levenshtein-0.27.1-cython-cpp.patch b/levenshtein-0.27.1-cython-cpp.patch new file mode 100644 index 0000000..78710f3 --- /dev/null +++ b/levenshtein-0.27.1-cython-cpp.patch @@ -0,0 +1,12 @@ +diff -up a/src/Levenshtein/CMakeLists.txt b/src/Levenshtein/CMakeLists.txt +--- a/src/Levenshtein/CMakeLists.txt 2026-01-10 17:00:11.456685025 -0500 ++++ b/src/Levenshtein/CMakeLists.txt 2026-01-10 17:00:37.252954218 -0500 +@@ -9,7 +9,7 @@ function(create_cython_target _name) + MAIN_DEPENDENCY "${CMAKE_CURRENT_LIST_DIR}/${_name}.pyx" + VERBATIM + COMMAND +- Python::Interpreter -m cython "${CMAKE_CURRENT_LIST_DIR}/${_name}.pyx" ++ Python::Interpreter -m cython --cplus "${CMAKE_CURRENT_LIST_DIR}/${_name}.pyx" + --output-file "${CMAKE_CURRENT_BINARY_DIR}/${_name}.cxx") + + set(${_name} diff --git a/python-Levenshtein.spec b/python-Levenshtein.spec index 58ce4c2..61fdd25 100644 --- a/python-Levenshtein.spec +++ b/python-Levenshtein.spec @@ -1,7 +1,7 @@ %global srcname Levenshtein -%global forgeurl https://github.com/maxbachmann/%{srcname} -Version: 0.26.1 +%global forgeurl https://github.com/rapidfuzz/%{srcname} +Version: 0.27.3 %forgemeta Name: python-%{srcname} @@ -15,8 +15,7 @@ License: GPL-2.0-or-later URL: %{forgeurl} Source0: %{forgesource} - -Patch: https://github.com/rapidfuzz/Levenshtein/pull/72.patch +Patch0: levenshtein-0.27.1-cython-cpp.patch BuildRequires: cmake BuildRequires: gcc @@ -38,9 +37,12 @@ Summary: %{summary} %description -n python3-%{srcname} %_description %prep -%autosetup -n %{srcname}-%{version} -# Levenshtein can build under older Cython successfully -sed 's/Cython>=3.0.0[ab0-9]\+/Cython>=0.29.26/' -i pyproject.toml +%autosetup -n %{srcname}-%{version} -p1 +# Remove Cython's upper constraint +sed -i '/Cython>=3\.[0-9]\+\./s/,\s*<3\.[0-9]\+\.[0-9a-z]*[0-9]*//' pyproject.toml + +# Open up the rapidfuzz version constraint. +sed -i 's/rapidfuzz 3.2.0/rapidfuzz 3.2...<4/' CMakeLists.txt %generate_buildrequires %pyproject_buildrequires @@ -63,7 +65,7 @@ export SKBUILD_CMAKE_BUILD_TYPE=RelWithDebInfo %files -n python3-%{srcname} -f %{pyproject_files} %doc README.md -%license COPYING +%license LICENSE %changelog diff --git a/sources b/sources index c97b8af..d4344d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Levenshtein-0.26.1.tar.gz) = 589b1f404108f488caf880063f20ee9c6a2033b0a2cd819352bf15e285ea8537c1dc8117de70679f720fd3da47546f7e0e5c620e4da8cf09bf8df9b119e6abc9 +SHA512 (Levenshtein-0.27.3.tar.gz) = 1102d6421066ea59c821416d80eec99044fd574659db2e063a5564249afddac097e740788b8d0f5c1c3c72c1a4d3ae94f027ac8609f5ad1cadde378aaee9bf43