From 8db20becb99d30b390f4934037d4b79fe1f4903c Mon Sep 17 00:00:00 2001 From: David Bold Date: Feb 16 2024 22:02:31 +0000 Subject: Reintroduce patch (polib is still bundled upstream) --- diff --git a/git-cola.spec b/git-cola.spec index 9d4f7ff..cce0821 100644 --- a/git-cola.spec +++ b/git-cola.spec @@ -7,6 +7,8 @@ License: GPL-2.0-or-later URL: https://git-cola.github.io Source0: https://github.com/git-cola/git-cola/archive/v%{version}/%{name}-%{version}.tar.gz +Patch: polib.patch + BuildArch: noarch BuildRequires: desktop-file-utils diff --git a/polib.patch b/polib.patch new file mode 100644 index 0000000..bd772e3 --- /dev/null +++ b/polib.patch @@ -0,0 +1,38 @@ +diff -ur a/cola/i18n.py b/cola/i18n.py +--- a/cola/i18n.py 2024-01-23 09:17:40.000000000 +0000 ++++ b/cola/i18n.py 2024-02-16 11:14:03.906304362 +0000 +@@ -1,10 +1,10 @@ + """i18n and l10n support for git-cola""" + import locale + import os ++import polib + import sys + + from . import core +-from . import polib + from . import resources + + +diff -ur a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2024-01-23 09:17:40.000000000 +0000 ++++ b/pyproject.toml 2024-02-16 11:14:54.890452223 +0000 +@@ -24,7 +24,7 @@ + git-cola-sequence-editor = "cola.sequenceeditor:main" + + [build-system] +-requires = ["setuptools>=42", "setuptools_scm[toml]>=3.4.1"] ++requires = ["setuptools>=42", "setuptools_scm[toml]>=3.4.1", "polib>=1.1.1"] + build-backend = "setuptools.build_meta" + + [tool.cercis] +diff -ur a/setup.cfg b/setup.cfg +--- a/setup.cfg 2024-01-23 09:17:40.000000000 +0000 ++++ b/setup.cfg 2024-02-16 11:16:52.724793957 +0000 +@@ -25,6 +25,7 @@ + include_package_data = true + install_requires = + importlib_metadata; python_version<"3.8" ++ polib >= 1.1.1 + qtpy >= 1.1.0 + zip_safe = false +