#1 Patch requirements to rename python-Levenshtein to Levenshtein.
Merged 9 months ago by qulogic. Opened 9 months ago by troycurtisjr.
rpms/ troycurtisjr/paperwork fix-levenshtein-ref  into  rawhide

@@ -0,0 +1,22 @@ 

+ diff -up paperwork-2.1.2/setup.py.orig paperwork-2.1.2/setup.py

+ --- a/paperwork-2.1.2/setup.py	2023-07-22 22:41:37.787416023 -0400

+ +++ b/paperwork-2.1.2/setup.py	2023-07-22 22:42:07.987688285 -0400

+ @@ -90,7 +90,7 @@ Main features are:

+          "openpaperwork-gtk",

+          "pycountry",

+          "pyocr >= 0.3.0",

+ -        "python-Levenshtein",

+ +        "Levenshtein",

+          "pyxdg >= 0.25",

+          "paperwork-backend>={}".format(version),

+  

+ diff -up paperwork-2.1.2/src/paperwork.egg-info/requires.txt.orig paperwork-2.1.2/src/paperwork.egg-info/requires.txt

+ --- a/paperwork-2.1.2/src/paperwork.egg-info/requires.txt	2023-07-23 14:56:07.332088123 -0400

+ +++ b/paperwork-2.1.2/src/paperwork.egg-info/requires.txt	2023-07-23 14:56:13.424146746 -0400

+ @@ -4,5 +4,5 @@ openpaperwork-gtk

+  paperwork-backend>=2.1.2

+  pycountry

+  pyocr>=0.3.0

+ -python-Levenshtein

+ +Levenshtein

+  pyxdg>=0.25

file modified
+4
@@ -9,6 +9,10 @@ 

  URL:            https://gitlab.gnome.org/World/OpenPaperwork/paperwork

  Source0:        %pypi_source %{srcname}

  Patch0001:      0001-Drop-extra-icon-dirs.patch

+ # python-Levenshtein changed to just Levenshtein. There isn't an upstream

+ # patch because upstream has decided to drop the dependency

+ # https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/9072eea40e09b337939ed3c98b642df203752e9e

+ Patch0002:      0002-fix-levenshtein.patch

  

  BuildArch:      noarch

  

The Levenshtein upstream changed its PyPi name from python-Levenshtein to Levenshtein. This patches paperwork to reference the correct name. I didn't create an upstream fix as they have decided to just copy in a Levenshtein implementation instead of trying to use the Python package as a dependency.

The requisite Levenshtein update has been submitted to bodhi https://bodhi.fedoraproject.org/updates/FEDORA-2023-770777bdbb so should be available shortly. I was originally planning to use a side tag, but since the Python upgrade caused the Levenshtein package to fail at runtime anyway, I've pushed out the Levenshtein update first.

There is a required PR for the backend as well: https://src.fedoraproject.org/rpms/python-paperwork-backend/pull-request/2

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/db438631d18b4c85bb5b0b249f74a468

Pull-Request has been merged by qulogic

9 months ago
Metadata