forked from pool/python-pygit2
Accepting request 845686 from devel:languages:python
- Add libgit2_1.patch for compatibility with libgit 1.1.0
- Update to v1.3.0
* New Repository.applies, Repository.revparse, Repository.revparse_ext,
Repository.add_submodule, Repository.raw_listall_branches, and
Repository.raw_listall_references
* New optional flags and file_flags arguments in
Repository.merge_commits and Repository.merge_trees
* New Reference.raw_target
* Allow bytes in Repository.lookup_branch and Repository.diff
* New GIT_BLAME_FIRST_PARENT and GIT_BLAME_USE_MAILMAP constants
* New IndexEntry supports repr(), str(), == and !=
* New Object supports repr()
* New accept tuples of strings (not only lists) in a number of places
* Fix compatibility with old macOS 10.9
* Fix check argument type in Repository.apply(...)
* Fix raise exception if error in Repository.listall_submodules()
* Fix a couple of refcount errors in OdbBackend.refresh() and
Worktree_is_prunable
OBS-URL: https://build.opensuse.org/request/show/845686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pygit2?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fada16a7d8
35
libgit2_1.patch
Normal file
35
libgit2_1.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From b57aa0e889fe07d7b4663d0729a40f4a9ecf5578 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
|
||||
Date: Wed, 14 Oct 2020 08:36:08 +0200
|
||||
Subject: [PATCH] Upgrade to libgit2 1.1
|
||||
|
||||
Fixes #1040
|
||||
---
|
||||
|
||||
diff --git a/src/pygit2.c b/src/pygit2.c
|
||||
index 4e144705..0693a790 100644
|
||||
--- a/src/pygit2.c
|
||||
+++ b/src/pygit2.c
|
||||
@@ -590,6 +590,7 @@ PyInit__pygit2(void)
|
||||
ADD_CONSTANT_INT(m, GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES)
|
||||
ADD_CONSTANT_INT(m, GIT_BLAME_FIRST_PARENT)
|
||||
ADD_CONSTANT_INT(m, GIT_BLAME_USE_MAILMAP)
|
||||
+ ADD_CONSTANT_INT(m, GIT_BLAME_IGNORE_WHITESPACE)
|
||||
|
||||
/* Merge */
|
||||
ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_NONE)
|
||||
diff --git a/src/types.h b/src/types.h
|
||||
index 0f3c8cf9..8ea01d38 100644
|
||||
--- a/src/types.h
|
||||
+++ b/src/types.h
|
||||
@@ -32,8 +32,8 @@
|
||||
#include <Python.h>
|
||||
#include <git2.h>
|
||||
|
||||
-#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 0)
|
||||
-#error You need a compatible libgit2 version (1.0.x)
|
||||
+#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 1)
|
||||
+#error You need a compatible libgit2 version (1.1.x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de9421118a99c79cbba1e512d60e5caed1d63273ce30a0e8d4edef4a2e500387
|
||||
size 235852
|
||||
3
pygit2-1.3.0.tar.gz
Normal file
3
pygit2-1.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452
|
||||
size 243399
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 1 04:07:45 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
|
||||
|
||||
- Add libgit2_1.patch for compatibility with libgit 1.1.0
|
||||
- Update to v1.3.0
|
||||
* New Repository.applies, Repository.revparse, Repository.revparse_ext,
|
||||
Repository.add_submodule, Repository.raw_listall_branches, and
|
||||
Repository.raw_listall_references
|
||||
* New optional flags and file_flags arguments in
|
||||
Repository.merge_commits and Repository.merge_trees
|
||||
* New Reference.raw_target
|
||||
* Allow bytes in Repository.lookup_branch and Repository.diff
|
||||
* New GIT_BLAME_FIRST_PARENT and GIT_BLAME_USE_MAILMAP constants
|
||||
* New IndexEntry supports repr(), str(), == and !=
|
||||
* New Object supports repr()
|
||||
* New accept tuples of strings (not only lists) in a number of places
|
||||
* Fix compatibility with old macOS 10.9
|
||||
* Fix check argument type in Repository.apply(...)
|
||||
* Fix raise exception if error in Repository.listall_submodules()
|
||||
* Fix a couple of refcount errors in OdbBackend.refresh() and
|
||||
Worktree_is_prunable
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 6 08:01:51 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
|
||||
@ -20,12 +20,14 @@
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
%define skip_python2 1
|
||||
Name: python-pygit2
|
||||
Version: 1.2.1
|
||||
Version: 1.3.0
|
||||
Release: 0
|
||||
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 libgit2_1.patch gh#libgit2/pygit2#1040
|
||||
Patch0: libgit2_1.patch
|
||||
BuildRequires: %{python_module cached-property}
|
||||
BuildRequires: %{python_module cffi >= 1.4.0}
|
||||
BuildRequires: %{python_module devel}
|
||||
@ -34,7 +36,7 @@ BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: ca-certificates
|
||||
BuildRequires: ca-certificates-mozilla
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libgit2-devel >= 1.0
|
||||
BuildRequires: libgit2-devel >= 1.1
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires: python-cached-property
|
||||
@ -46,6 +48,7 @@ Bindings for libgit2, a linkable C library for the Git version-control system.
|
||||
|
||||
%prep
|
||||
%setup -q -n pygit2-%{version}
|
||||
%patch0 -p1
|
||||
# do not add options to pytest
|
||||
rm pytest.ini
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user