From 2053d83652ab191142ed22e645c72cd241415009 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Apr 26 2017 06:09:23 +0000 Subject: Update to 0.25.1 Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index 6200467..70309d6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /pygit2-0.24.1.tar.gz /pygit2-0.24.2.tar.gz /pygit2-0.25.0.tar.gz +/pygit2-0.25.1.tar.gz diff --git a/python-pygit2.spec b/python-pygit2.spec index 9d485cf..2660d2f 100644 --- a/python-pygit2.spec +++ b/python-pygit2.spec @@ -1,12 +1,14 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global pkgname pygit2 +%if 0%{?rhel} && 0%{?rhel} < 7 +%bcond_with python3 +%else +%bcond_without python3 +%endif + Name: python-%{pkgname} -Version: 0.25.0 -Release: 3%{?dist} +Version: 0.25.1 +Release: 1%{?dist} Summary: Python bindings for libgit2 License: GPLv2 with linking exception @@ -22,14 +24,13 @@ 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}} BuildRequires: python2-cffi BuildRequires: python2-devel -BuildRequires: python2-nose BuildRequires: python2-setuptools +BuildRequires: python2-nose BuildRequires: python2-six Requires: python2-cffi Requires: python2-six @@ -40,15 +41,14 @@ the core of Git. Python 2 version. - -%if 0%{?with_python3} +%if %{with python3} %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-nose BuildRequires: python3-setuptools +BuildRequires: python3-nose BuildRequires: python3-six Requires: python3-cffi Requires: python3-six @@ -60,7 +60,6 @@ the core of Git. Python 3 version. %endif - %package doc Summary: Documentation for %{name} BuildArch: noarch @@ -69,24 +68,19 @@ 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} +%if %{with python3} %py3_build %endif - +make -C docs html %install %py2_install - -%if 0%{?with_python3} +%if %{with python3} %py3_install %endif @@ -95,28 +89,25 @@ find %{_builddir} -name '.buildinfo' -delete # Correct the permissions. find %{buildroot} -name '*.so' -exec chmod 755 {} ';' - %check %{__python2} setup.py test - -%if 0%{?with_python3} +%if %{with python3} %{__python3} setup.py test %endif - %files -n python2-%{pkgname} %doc README.rst TODO.txt %license COPYING -%{python2_sitearch}/%{pkgname}-%{version}-py%{python2_version}.egg-info -%{python2_sitearch}/%{pkgname} +%{python2_sitearch}/%{pkgname}-*.egg-info/ +%{python2_sitearch}/%{pkgname}/ %{python2_sitearch}/_%{pkgname}.so -%if 0%{?with_python3} +%if %{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}-*.egg-info/ +%{python3_sitearch}/%{pkgname}/ %{python3_sitearch}/_%{pkgname}.*.so %endif @@ -124,8 +115,10 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';' %license COPYING %doc docs/_build/html/* - %changelog +* Wed Apr 26 2017 Igor Gnatenko - 0.25.1-1 +- Update to 0.25.1 + * Mon Apr 10 2017 Pete Walter - 0.25.0-3 - Trivial spec file fixes - Add Python 3 conditionals diff --git a/sources b/sources index 709b4c0..805a33e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pygit2-0.25.0.tar.gz) = 5619b09d3bf7aca6ccab2c29d2b220ec6942ba9190b4d52c058bcc29036ff10e20ed869c6ebc8131dccba07205699c7d567c0db538e54db64bdb058c3a0ca080 +SHA512 (pygit2-0.25.1.tar.gz) = bb98786ee10d00822a9d61617052ee58dbd2ea5285a30cb13ea1c0ada5827ce11a66368f70ae2201c817f93fbbc596a781b74421b09735fbeaeb1a05f5bd5d4d