From 96035f77fc5938835ffd2fa6b8405d4f25963bce Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Jun 06 2019 12:40:39 +0000
Subject: Merge branch '0.28'


---

diff --git a/.gitignore b/.gitignore
index a905388..06a0463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
 /pygit2-0.27.2.tar.gz
 /pygit2-0.27.3.tar.gz
 /pygit2-0.27.4.tar.gz
+/pygit2-0.28.0.tar.gz
+/pygit2-0.28.2.tar.gz
diff --git a/python-pygit2.spec b/python-pygit2.spec
index 66992e3..8177203 100644
--- a/python-pygit2.spec
+++ b/python-pygit2.spec
@@ -1,32 +1,38 @@
+%if 0%{?fedora} && 0%{?fedora} <= 28
+  # https://github.com/libgit2/pygit2/issues/811
+  # https://github.com/libgit2/pygit2/issues/812
+  %global arch_test_fail aarch64 ppc64 s390x
+%else
+  # https://github.com/libgit2/pygit2/issues/811
+  %global arch_test_fail ppc64 s390x
+%endif
 %global pkgname pygit2
+%{?python_enable_dependency_generator}
 
 Name:           python-%{pkgname}
-Version:        0.27.4
-Release:        2%{?dist}
+Version:        0.28.2
+Release:        1%{?dist}
 Summary:        Python bindings for libgit2
 
 License:        GPLv2 with linking exception
-URL:            http://www.pygit2.org
+URL:            https://www.pygit2.org/
 Source0:        https://github.com/libgit2/%{pkgname}/archive/v%{version}/%{pkgname}-%{version}.tar.gz
 
 BuildRequires:  gcc
-BuildRequires:  libgit2-devel
+BuildRequires:  (libgit2-devel >= 0.28.0 with libgit2-devel < 0.29.0)
 
 %description
 pygit2 is a set of Python bindings to the libgit2 library, which implements
 the core of Git.
 
-
 %package -n     python3-%{pkgname}
 Summary:        Python 3.x bindings for libgit2
 %{?python_provide:%python_provide python3-%{pkgname}}
-BuildRequires:  python3-cffi
 BuildRequires:  python3-devel
-BuildRequires:  python3-pytest
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-cffi
 BuildRequires:  python3-six
-Requires:       python3-cffi
-Requires:       python3-six
+BuildRequires:  python3-pytest
 
 %description -n python3-%{pkgname}
 pygit2 is a set of Python bindings to the libgit2 library, which implements
@@ -34,7 +40,6 @@ the core of Git.
 
 Python 3 version.
 
-
 %package        doc
 Summary:        Documentation for %{name}
 BuildArch:      noarch
@@ -43,35 +48,27 @@ BuildRequires:  /usr/bin/sphinx-build
 %description    doc
 Documentation for %{name}.
 
-
 %prep
 %autosetup -n %{pkgname}-%{version} -p1
 
-
 %build
 %py3_build
-
 make -C docs html
 
-
 %install
 %py3_install
-
 find %{_builddir} -name '.buildinfo' -delete
 
 # Correct the permissions.
 find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 
-
 %check
-# https://github.com/libgit2/pygit2/issues/812
-%ifarch ppc64 s390x
-  PYTHONPATH=%{buildroot}%{python3_sitearch} pytest-3 || :
+%ifarch %{arch_test_fail}
+  PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-%{python3_version} -v || :
 %else
-  PYTHONPATH=%{buildroot}%{python3_sitearch} pytest-3
+  PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-%{python3_version} -v
 %endif
 
-
 %files -n python3-%{pkgname}
 %doc README.rst TODO.txt
 %license COPYING
@@ -83,8 +80,10 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 %license COPYING
 %doc docs/_build/html/*
 
-
 %changelog
+* Thu Jun 06 14:32:34 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.28.2-1
+- Update to 0.28.2
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.27.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 8821a2a..a3af7ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pygit2-0.27.4.tar.gz) = 7673ff8df7a942bcdc462e121327c668634ba61d48f654052202ef63a729903f2b5f238441bbaa52945657f69c2f6630593eaf5ee9f888c97e09db483785ce5e
+SHA512 (pygit2-0.28.2.tar.gz) = ee8d271547704a341cb4917dfff5338550d2ddeb3c6ab4c9560665272fcaccba5427b01947d815b5329587c944803b78f3ee62df4709187b6a813d60cc51f5c6