Accepting request 687891 from home:Pharaoh_Atem:branches:devel:languages:python

- Update to 0.28.0
  * Update to libgit2 v0.28
  * New ``pygit2.Mailmap``
  * New ``Repository.apply(...)`` wraps ``git_apply(..)``
  * Now ``Repository.merge_analysis(...)`` accepts an optional reference parameter
  * Now ``Repository.add_worktree(...)`` accepts an optional reference parameter
  * Now it's possible to set SSL certificate locations
  * Test and documentation improvements
  * Now ``worktree.path`` returns the path to the worktree directory
  * Remove undocumented ``worktree.git_path``
- Remove unneeded patch to fix issues on i586:
  * pygit2-i586.patch
- Add patch to remove unneeded constraint on pycparser
  * pygit2-0.28-Remove-pycparser-constraint.patch

OBS-URL: https://build.opensuse.org/request/show/687891
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygit2?expand=0&rev=44

pygit2-0.27.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6febce4aea72f12ed5a1e7529b91119f21d93cb2ccb3f834eea26af76cc9a4cb
-size 477427

pygit2-0.28-Remove-pycparser-constraint.patch

@@ -0,0 +1,28 @@
+From d612cc24a9e4d2f4aeb50db4ee0b4b393bf46298 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Wed, 20 Mar 2019 16:50:37 -0400
+Subject: [PATCH] Revert "pycparser 2.18+ is broken"
+
+Tests seem to work fine without this constraint.
+
+This reverts commit b1bbdcb98643baf5d4d7634d7afc18feda56de52.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 79e82df..3165e3d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -154,7 +154,7 @@ setup(name='pygit2',
+       packages=['pygit2'],
+       package_data={'pygit2': ['decl.h']},
+       setup_requires=['cffi'],
+-      install_requires=['cffi', 'six', 'pycparser<2.18'],
++      install_requires=['cffi', 'six'],
+       zip_safe=False,
+       cmdclass=cmdclass,
+       **extra_args)
+-- 
+2.20.1
+

pygit2-0.28.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6dbce6aa7e0e1878ad19363a0e0de52f419b4abe2750c89974a42501bed2cf52
+size 486621

pygit2-i586.patch

@@ -1,22 +0,0 @@
-From 1d11fa171b56114f181ac022715baba9581d36e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Sun, 20 May 2018 17:52:34 +0200
-Subject: [PATCH] Update git_time decl
-
-Should fix #795
----
- pygit2/decl.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pygit2/decl.h b/pygit2/decl.h
-index 9cdea8a0..53451583 100644
---- a/pygit2/decl.h
-+++ b/pygit2/decl.h
-@@ -77,6 +77,7 @@ typedef struct {
- typedef struct git_time {
- 	git_time_t time;
- 	int offset;
-+	char sign;
- } git_time;
- 
- typedef struct git_signature {

python-pygit2.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Mar 20 20:40:34 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
+
+- Update to 0.28.0
+  * Update to libgit2 v0.28
+  * New ``pygit2.Mailmap``
+  * New ``Repository.apply(...)`` wraps ``git_apply(..)``
+  * Now ``Repository.merge_analysis(...)`` accepts an optional reference parameter
+  * Now ``Repository.add_worktree(...)`` accepts an optional reference parameter
+  * Now it's possible to set SSL certificate locations
+  * Test and documentation improvements
+  * Now ``worktree.path`` returns the path to the worktree directory
+  * Remove undocumented ``worktree.git_path``
+- Remove unneeded patch to fix issues on i586:
+  * pygit2-i586.patch
+- Add patch to remove unneeded constraint on pycparser
+  * pygit2-0.28-Remove-pycparser-constraint.patch
+
 -------------------------------------------------------------------
 Mon May 21 08:33:07 UTC 2018 - tchvatal@suse.com
 

python-pygit2.spec

@@ -2,6 +2,7 @@
 # spec file for package python-pygit2
 #
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 Neal Gompa <ngompa13@gmail.com>.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +17,27 @@
 #
 
 
+# Define incompatible version for building libgit2
+%global libgit2_incompat_ver 0.29
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pygit2
-Version:        0.27.0
+Version:        0.28.0
 Release:        0
 Summary:        Python bindings for libgit2
 License:        GPL-2.0-only
 Group:          Development/Languages/Python
 URL:            https://github.com/libgit2/pygit2
 Source:         https://files.pythonhosted.org/packages/source/p/pygit2/pygit2-%{version}.tar.gz
-Patch0:         pygit2-i586.patch
+Patch0:         pygit2-0.28-Remove-pycparser-constraint.patch
 BuildRequires:  %{python_module cffi}
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six}
+BuildRequires:  ca-certificates
+BuildRequires:  ca-certificates-mozilla
 BuildRequires:  fdupes
-BuildRequires:  libgit2-devel >= %{version}
+BuildRequires:  (libgit2-devel >= %{version} with libgit2-devel < %{libgit2_incompat_ver})
 BuildRequires:  libopenssl-devel
 BuildRequires:  python-rpm-macros
 Requires:       python-six
@@ -42,8 +48,7 @@ Requires:       python-six
 Bindings for libgit2, a linkable C library for the Git version-control system.
 
 %prep
-%setup -q -n pygit2-%{version}
+%autosetup -n pygit2-%{version} -p1
-%patch0 -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"