diff --git a/.gitignore b/.gitignore index 477366a..047aaf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ python-Levenshtein-0.10.1.tar.bz2 /python-Levenshtein-0.12.0.tar.gz /Levenshtein-0.20.8.tar.gz -/python-Levenshtein-0.21.0.tar.gz -/Levenshtein-0.21.0.tar.gz -/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/changelog b/changelog index 66c633e..5c6a9a6 100644 --- a/changelog +++ b/changelog @@ -1,12 +1,3 @@ -* Fri Jul 21 2023 Fedora Release Engineering - 0.12.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 0.12.0-24 -- Rebuilt for Python 3.12 - -* Fri Jan 20 2023 Fedora Release Engineering - 0.12.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Fri Jul 22 2022 Fedora Release Engineering - 0.12.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/levenshtein-0.27.1-cython-cpp.patch b/levenshtein-0.27.1-cython-cpp.patch deleted file mode 100644 index 78710f3..0000000 --- a/levenshtein-0.27.1-cython-cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 61fdd25..5e56868 100644 --- a/python-Levenshtein.spec +++ b/python-Levenshtein.spec @@ -1,7 +1,7 @@ %global srcname Levenshtein -%global forgeurl https://github.com/rapidfuzz/%{srcname} -Version: 0.27.3 +%global forgeurl https://github.com/maxbachmann/%{srcname} +Version: 0.21.0 %forgemeta Name: python-%{srcname} @@ -15,7 +15,6 @@ License: GPL-2.0-or-later URL: %{forgeurl} Source0: %{forgesource} -Patch0: levenshtein-0.27.1-cython-cpp.patch BuildRequires: cmake BuildRequires: gcc @@ -37,22 +36,15 @@ Summary: %{summary} %description -n python3-%{srcname} %_description %prep -%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 +%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 %generate_buildrequires %pyproject_buildrequires %build -# To avoid empty debugsourcefiles.list, we need to build the package -# with RelWithDebInfo -# Upstream issue: https://github.com/scikit-build/scikit-build-core/issues/915 -export SKBUILD_CMAKE_BUILD_TYPE=RelWithDebInfo %pyproject_wheel %install @@ -65,7 +57,7 @@ export SKBUILD_CMAKE_BUILD_TYPE=RelWithDebInfo %files -n python3-%{srcname} -f %{pyproject_files} %doc README.md -%license LICENSE +%license COPYING %changelog diff --git a/sources b/sources index d4344d7..177ff30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Levenshtein-0.27.3.tar.gz) = 1102d6421066ea59c821416d80eec99044fd574659db2e063a5564249afddac097e740788b8d0f5c1c3c72c1a4d3ae94f027ac8609f5ad1cadde378aaee9bf43 +SHA512 (Levenshtein-0.20.8.tar.gz) = 3a248b5d1a18c8afeffaa637c831b07266dd36a094b713c18b7182a49de7df9a3b7316d00e9329e2ae49f92c601e32a61590338e30a7e4f33ffe0d76c6219061