diff --git a/pygit2-0.27.0.tar.gz b/pygit2-0.27.0.tar.gz deleted file mode 100644 index 0931559..0000000 --- a/pygit2-0.27.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6febce4aea72f12ed5a1e7529b91119f21d93cb2ccb3f834eea26af76cc9a4cb -size 477427 diff --git a/pygit2-0.28.0.tar.gz b/pygit2-0.28.0.tar.gz new file mode 100644 index 0000000..0b313bb --- /dev/null +++ b/pygit2-0.28.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dbce6aa7e0e1878ad19363a0e0de52f419b4abe2750c89974a42501bed2cf52 +size 486621 diff --git a/pygit2-i586.patch b/pygit2-i586.patch deleted file mode 100644 index 661a302..0000000 --- a/pygit2-i586.patch +++ /dev/null @@ -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?= -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 { diff --git a/python-pygit2.changes b/python-pygit2.changes index 7a638a8..89bc011 100644 --- a/python-pygit2.changes +++ b/python-pygit2.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sat Mar 23 11:32:34 UTC 2019 - Tomáš Chvátal + +- Drop the pygit2-0.28-Remove-pycparser-constraint.patch and replace + it with shorter sed +- Switch to pytest testing: + * Fails now but that is pycparser bug https://github.com/eliben/pycparser/issues/305 +- Disable tests temporarily as per above + +------------------------------------------------------------------- +Wed Mar 20 20:40:34 UTC 2019 - Neal Gompa + +- 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 diff --git a/python-pygit2.spec b/python-pygit2.spec index 2f916d2..f83b574 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,7 +1,8 @@ # # spec file for package python-pygit2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 Neal Gompa . # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,28 +13,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!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 BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} +BuildRequires: %{python_module pycparser} +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: libopenssl-devel BuildRequires: python-rpm-macros +Requires: python-pycparser Requires: python-six %requires_eq python-cffi %python_subpackages @@ -43,7 +48,10 @@ Bindings for libgit2, a linkable C library for the Git version-control system. %prep %setup -q -n pygit2-%{version} -%patch0 -p1 +# do not hardcode version +sed -i -e 's:pycparser<2.18:pycparser:g' setup.py +# do not add options to pytest +rm pytest.ini %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -54,7 +62,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -%python_exec setup.py test +# disable tests for now until https://github.com/libgit2/pygit2/issues/846 +# gets fixed; upstream https://github.com/eliben/pycparser/issues/305 +#%%pytest_arch %files %{python_files} %license COPYING