Revert "Drop conditionals for RHEL"

Igor, please stop changing other people's packages. This is abuse of
provenpackager power. The RHEL conditionals are needed for maintaining the
EPEL7 branch. Thanks.

This reverts commit 7af8458b9f.
This commit is contained in:
Pete Walter 2018-08-20 22:57:28 +01:00
parent 0b43ffa002
commit 21106414ba

View File

@ -1,3 +1,7 @@
%if 0%{?fedora} || 0%{?rhel} > 7
%global with_python3 1
%endif
%global pkgname pygit2 %global pkgname pygit2
Name: python-%{pkgname} Name: python-%{pkgname}
@ -16,6 +20,7 @@ BuildRequires: libgit2-devel
pygit2 is a set of Python bindings to the libgit2 library, which implements pygit2 is a set of Python bindings to the libgit2 library, which implements
the core of Git. the core of Git.
%package -n python2-%{pkgname} %package -n python2-%{pkgname}
Summary: Python 2.x bindings for libgit2 Summary: Python 2.x bindings for libgit2
%{?python_provide:%python_provide python2-%{pkgname}} %{?python_provide:%python_provide python2-%{pkgname}}
@ -32,6 +37,8 @@ the core of Git.
Python 2 version. Python 2 version.
%if 0%{?with_python3}
%package -n python3-%{pkgname} %package -n python3-%{pkgname}
Summary: Python 3.x bindings for libgit2 Summary: Python 3.x bindings for libgit2
%{?python_provide:%python_provide python3-%{pkgname}} %{?python_provide:%python_provide python3-%{pkgname}}
@ -47,6 +54,8 @@ pygit2 is a set of Python bindings to the libgit2 library, which implements
the core of Git. the core of Git.
Python 3 version. Python 3 version.
%endif
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{name}
@ -56,34 +65,49 @@ BuildRequires: %{_bindir}/sphinx-build
%description doc %description doc
Documentation for %{name}. Documentation for %{name}.
%prep %prep
%autosetup -n %{pkgname}-%{version} -p1 %autosetup -n %{pkgname}-%{version} -p1
%build %build
%py2_build %py2_build
make -C docs html make -C docs html
%if 0%{?with_python3}
%py3_build %py3_build
%endif
%install %install
%py2_install %py2_install
%if 0%{?with_python3}
%py3_install %py3_install
%endif
find %{_builddir} -name '.buildinfo' -delete find %{_builddir} -name '.buildinfo' -delete
# Correct the permissions. # Correct the permissions.
find %{buildroot} -name '*.so' -exec chmod 755 {} ';' find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
%check %check
# https://github.com/libgit2/pygit2/issues/811 # https://github.com/libgit2/pygit2/issues/811
# https://github.com/libgit2/pygit2/issues/812 # https://github.com/libgit2/pygit2/issues/812
%ifarch aarch64 ppc64 s390x %ifarch aarch64 ppc64 s390x
%{__python2} setup.py test || : %{__python2} setup.py test || :
%if 0%{?with_python3}
%{__python3} setup.py test || : %{__python3} setup.py test || :
%endif
%else %else
%{__python2} setup.py test %{__python2} setup.py test
%if 0%{?with_python3}
%{__python3} setup.py test %{__python3} setup.py test
%endif
%endif %endif
%files -n python2-%{pkgname} %files -n python2-%{pkgname}
%doc README.rst TODO.txt %doc README.rst TODO.txt
%license COPYING %license COPYING
@ -91,17 +115,20 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
%{python2_sitearch}/%{pkgname}/ %{python2_sitearch}/%{pkgname}/
%{python2_sitearch}/_%{pkgname}.so %{python2_sitearch}/_%{pkgname}.so
%if 0%{?with_python3}
%files -n python3-%{pkgname} %files -n python3-%{pkgname}
%doc README.rst TODO.txt %doc README.rst TODO.txt
%license COPYING %license COPYING
%{python3_sitearch}/%{pkgname}-*.egg-info/ %{python3_sitearch}/%{pkgname}-*.egg-info/
%{python3_sitearch}/%{pkgname}/ %{python3_sitearch}/%{pkgname}/
%{python3_sitearch}/_%{pkgname}.*.so %{python3_sitearch}/_%{pkgname}.*.so
%endif
%files doc %files doc
%license COPYING %license COPYING
%doc docs/_build/html/* %doc docs/_build/html/*
%changelog %changelog
* Fri Aug 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.27.1-1 * Fri Aug 10 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.27.1-1
- Update to 0.27.1 - Update to 0.27.1