From 2792e03e4c0d9cc6ccd5abcbb83b68ce7229b5e06d5dc4342dbe958210af3d64 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 21 Jul 2022 14:45:28 +0000 Subject: [PATCH] - Add patch support-libgit-1.5.patch: * Suppot libgit 1.5.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=68 --- python-pygit2.changes | 4 +++- python-pygit2.spec | 2 ++ support-libgit-1.5.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 support-libgit-1.5.patch diff --git a/python-pygit2.changes b/python-pygit2.changes index 17c5053..31b2160 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,11 +1,13 @@ ------------------------------------------------------------------- -Thu Jul 21 14:17:29 UTC 2022 - Steve Kowalik +Thu Jul 21 14:44:55 UTC 2022 - Steve Kowalik - Update to 1.9.2: * New Repository.create_commit_string(...) and Repository.create_commit_with_signature(...) #1142 * Linux and macOS wheels updated to libgit2 v1.4.3 * Remove redundant line #1139 +- Add patch support-libgit-1.5.patch: + * Suppot libgit 1.5.0 ------------------------------------------------------------------- Sat Mar 26 18:51:51 UTC 2022 - Dirk Müller diff --git a/python-pygit2.spec b/python-pygit2.spec index db45f3e..3c1176e 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -26,6 +26,8 @@ Summary: Python bindings for libgit2 License: GPL-2.0-only URL: https://github.com/libgit2/pygit2 Source: https://files.pythonhosted.org/packages/source/p/pygit2/pygit2-%{version}.tar.gz +# PATCH-FIX-UPSTREAM based on gh#libgit2/pygit2#14b1df84060ea4ab085202382e80672ec1a104e3 +Patch0: support-libgit-1.5.patch BuildRequires: %{python_module cached-property} BuildRequires: %{python_module cffi >= 1.4.0} BuildRequires: %{python_module devel} diff --git a/support-libgit-1.5.patch b/support-libgit-1.5.patch new file mode 100644 index 0000000..12bd343 --- /dev/null +++ b/support-libgit-1.5.patch @@ -0,0 +1,15 @@ +diff --git a/src/types.h b/src/types.h +index 78023e28..e851eacb 100644 +--- a/src/types.h ++++ b/src/types.h +@@ -32,8 +32,8 @@ + #include + #include + +-#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 4) +-#error You need a compatible libgit2 version (1.4.x) ++#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 4 && LIBGIT2_VER_MINOR <= 5) ++#error You need a compatible libgit2 version (1.4.x or 1.5.x) + #endif + + /*