From e81d060776df9dee6da0360302586f11bf4b2577 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 20 Nov 2017 08:36:29 +0100 Subject: [PATCH 1/3] Remove useless python3 conditions Signed-off-by: Igor Gnatenko --- python-pygit2.spec | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/python-pygit2.spec b/python-pygit2.spec index 9bf0b02..29063ea 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,7 +1,3 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global pkgname pygit2 Name: python-%{pkgname} @@ -22,7 +18,6 @@ BuildRequires: openssl-devel pygit2 is a set of Python bindings to the libgit2 library, which implements the core of Git. - %package -n python2-%{pkgname} Summary: Python 2.x bindings for libgit2 %{?python_provide:%python_provide python2-%{pkgname}} @@ -40,8 +35,6 @@ the core of Git. Python 2 version. - -%if 0%{?with_python3} %package -n python3-%{pkgname} Summary: Python 3.x bindings for libgit2 %{?python_provide:%python_provide python3-%{pkgname}} @@ -58,8 +51,6 @@ pygit2 is a set of Python bindings to the libgit2 library, which implements the core of Git. Python 3 version. -%endif - %package doc Summary: Documentation for %{name} @@ -69,40 +60,26 @@ BuildRequires: python-sphinx %description doc Documentation for %{name}. - %prep %autosetup -n %{pkgname}-%{version} -p1 - %build %py2_build make -C docs html - -%if 0%{?with_python3} %py3_build -%endif - %install %py2_install - -%if 0%{?with_python3} %py3_install -%endif find %{_builddir} -name '.buildinfo' -delete # Correct the permissions. find %{buildroot} -name '*.so' -exec chmod 755 {} ';' - %check %{__python2} setup.py test - -%if 0%{?with_python3} %{__python3} setup.py test -%endif - %files -n python2-%{pkgname} %doc README.rst TODO.txt @@ -111,20 +88,17 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';' %{python2_sitearch}/%{pkgname} %{python2_sitearch}/_%{pkgname}.so -%if 0%{?with_python3} %files -n python3-%{pkgname} %doc README.rst TODO.txt %license COPYING %{python3_sitearch}/%{pkgname}-%{version}-py%{python3_version}.egg-info %{python3_sitearch}/%{pkgname} %{python3_sitearch}/_%{pkgname}.*.so -%endif %files doc %license COPYING %doc docs/_build/html/* - %changelog * Thu Aug 03 2017 Fedora Release Engineering - 0.26.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 3e46ff15fc8466d45e5ce6b8c70b125f0ccbb2aa Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 20 Nov 2017 08:37:29 +0100 Subject: [PATCH 2/3] Update to 0.26.1 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + python-pygit2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 483ea48..667436c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /pygit2-0.25.0.tar.gz /pygit2-0.25.1.tar.gz /pygit2-0.26.0.tar.gz +/pygit2-0.26.1.tar.gz diff --git a/python-pygit2.spec b/python-pygit2.spec index 29063ea..4f71aac 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,8 +1,8 @@ %global pkgname pygit2 Name: python-%{pkgname} -Version: 0.26.0 -Release: 3%{?dist} +Version: 0.26.1 +Release: 1%{?dist} Summary: Python bindings for libgit2 License: GPLv2 with linking exception @@ -100,6 +100,9 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';' %doc docs/_build/html/* %changelog +* Mon Nov 20 2017 Igor Gnatenko - 0.26.1-1 +- Update to 0.26.1 + * Thu Aug 03 2017 Fedora Release Engineering - 0.26.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 566d3e4..0753617 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pygit2-0.26.0.tar.gz) = 97807c2128212b64c0f3482d50676e1ea2424c8e049d9904e547079df84e999ce3e29c7f512bf71b4e6fa5ff62965ac7fc0a34193c17f0b6b72d083102b236cf +SHA512 (pygit2-0.26.1.tar.gz) = 6935ca2008109ddb8ae6568420499656625bfed12430abe1e513c5a8d34c9d4653103679a29ed91fbfe9bb4dc76648175bfd97ec4e7b143a0e0c24899f98555e From 5c78c7091b5ab2bb57137cdcca4a2b7cfa4d1759 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 20 Nov 2017 11:24:42 +0000 Subject: [PATCH 3/3] Revert "Remove useless python3 conditions" They are needed for EPEL. This reverts commit e81d060776df9dee6da0360302586f11bf4b2577. --- python-pygit2.spec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/python-pygit2.spec b/python-pygit2.spec index 4f71aac..457c8e0 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,3 +1,7 @@ +%if 0%{?fedora} +%global with_python3 1 +%endif + %global pkgname pygit2 Name: python-%{pkgname} @@ -18,6 +22,7 @@ BuildRequires: openssl-devel pygit2 is a set of Python bindings to the libgit2 library, which implements the core of Git. + %package -n python2-%{pkgname} Summary: Python 2.x bindings for libgit2 %{?python_provide:%python_provide python2-%{pkgname}} @@ -35,6 +40,8 @@ the core of Git. Python 2 version. + +%if 0%{?with_python3} %package -n python3-%{pkgname} Summary: Python 3.x bindings for libgit2 %{?python_provide:%python_provide python3-%{pkgname}} @@ -51,6 +58,8 @@ pygit2 is a set of Python bindings to the libgit2 library, which implements the core of Git. Python 3 version. +%endif + %package doc Summary: Documentation for %{name} @@ -60,26 +69,40 @@ BuildRequires: python-sphinx %description doc Documentation for %{name}. + %prep %autosetup -n %{pkgname}-%{version} -p1 + %build %py2_build make -C docs html + +%if 0%{?with_python3} %py3_build +%endif + %install %py2_install + +%if 0%{?with_python3} %py3_install +%endif find %{_builddir} -name '.buildinfo' -delete # Correct the permissions. find %{buildroot} -name '*.so' -exec chmod 755 {} ';' + %check %{__python2} setup.py test + +%if 0%{?with_python3} %{__python3} setup.py test +%endif + %files -n python2-%{pkgname} %doc README.rst TODO.txt @@ -88,17 +111,20 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';' %{python2_sitearch}/%{pkgname} %{python2_sitearch}/_%{pkgname}.so +%if 0%{?with_python3} %files -n python3-%{pkgname} %doc README.rst TODO.txt %license COPYING %{python3_sitearch}/%{pkgname}-%{version}-py%{python3_version}.egg-info %{python3_sitearch}/%{pkgname} %{python3_sitearch}/_%{pkgname}.*.so +%endif %files doc %license COPYING %doc docs/_build/html/* + %changelog * Mon Nov 20 2017 Igor Gnatenko - 0.26.1-1 - Update to 0.26.1