rpms/python-pygit2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix building with patched cffi on Fedora 39

Browse Source 
Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
Nils Philippsen 2023-11-11 00:17:32 +01:00
parent 3bb3263853
commit 26717c853b
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
python-pygit2-cffiver.patch Normal file
View File

@ -0,0 +1,31 @@
diff -up pygit2-1.13.2/docs/install.rst.cffiver pygit2-1.13.2/docs/install.rst
--- pygit2-1.13.2/docs/install.rst.cffiver 2023-10-30 09:50:04.000000000 +0100
+++ pygit2-1.13.2/docs/install.rst 2023-11-11 00:01:15.551991748 +0100
@@ -55,7 +55,7 @@ Supported versions of Python:
Python requirements (these are specified in ``setup.py``):
-- cffi 1.16.0 or later
+- cffi 1.16.0 or later (or Fedora package >= 1.15.1-5)
Libgit2 **v1.7.1+**; binary wheels already include libgit2, so you only need to
worry about this if you install the source package.
diff -up pygit2-1.13.2/requirements.txt.cffiver pygit2-1.13.2/requirements.txt
--- pygit2-1.13.2/requirements.txt.cffiver 2023-10-30 09:50:04.000000000 +0100
+++ pygit2-1.13.2/requirements.txt 2023-11-10 23:58:49.756179131 +0100
@@ -1,2 +1,2 @@
-cffi>=1.16.0
+cffi>=1.9.1
setuptools ; python_version >= "3.12"
diff -up pygit2-1.13.2/setup.py.cffiver pygit2-1.13.2/setup.py
--- pygit2-1.13.2/setup.py.cffiver 2023-10-30 09:50:04.000000000 +0100
+++ pygit2-1.13.2/setup.py 2023-11-10 23:59:47.350500138 +0100
@@ -153,7 +153,7 @@ setup(
ext_modules=ext_modules,
# Requirements
python_requires='>=3.8',
- setup_requires=['cffi>=1.16.0'],
+ setup_requires=['cffi>=1.9.1'],
install_requires=install_requires,
# URLs
url='https://github.com/libgit2/pygit2',

21
python-pygit2.spec
View File

@ -8,6 +8,10 @@ Summary: Python bindings for libgit2
License: GPLv2 with linking exception
URL: https://www.pygit2.org/
Source0: https://github.com/libgit2/pygit2/archive/v%{version}.tar.gz#/%{pkgname}-%{version}.tar.gz
# This patch lowers the Python-level dependency on cffi. Fedora package python-cffi-1.15.1-5 and
# higher contain the patches needed for Python >= 3.12.
# Remove when cffi >= 1.16.0 is available on all releases with Python 3.12.
Patch: python-pygit2-cffiver.patch
BuildRequires: make
BuildRequires: gcc
@ -21,10 +25,11 @@ the core of Git.
%package -n python3-%{pkgname}
Summary: Python 3 bindings for libgit2
%{?python_provide:%python_provide python3-%{pkgname}}
BuildRequires: python3-cffi
BuildRequires: python3-devel
BuildRequires: python3-pytest
BuildRequires: python3-setuptools
# This version of cffi is patched for Python >= 3.12.
# Remove when cffi >= 1.16.0 is available on all releases with Python 3.12.
BuildRequires: python3-cffi >= 1.15.1-5
Requires: python3-cffi >= 1.15.1-5
%description -n python3-%{pkgname}
pygit2 is a set of Python bindings to the libgit2 library, which implements
@ -47,14 +52,18 @@ Documentation for %{name}.
%autosetup -n %{pkgname}-%{version} -p1
%generate_buildrequires
%pyproject_buildrequires
%build
%py3_build
%pyproject_wheel
make -C docs html
%install
%py3_install
%pyproject_install
find %{_builddir} -name '.buildinfo' -print -delete
@ -72,7 +81,7 @@ rm -f pygit2/__init__.py
%files -n python3-%{pkgname}
%license COPYING
%doc README.rst
%{python3_sitearch}/%{pkgname}-*.egg-info/
%{python3_sitearch}/%{pkgname}-*.dist-info/
%{python3_sitearch}/%{pkgname}/
%files doc