From b04a126488f45cf0326f2f8f385567c8c48e91a0 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 4 Oct 2017 21:59:04 +0200 Subject: [PATCH] Added spec file conditionals to build for EPEL 7 (#1498616) --- python-olefile.spec | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/python-olefile.spec b/python-olefile.spec index b2c2d6e..3ba2e05 100644 --- a/python-olefile.spec +++ b/python-olefile.spec @@ -9,7 +9,7 @@ antivirus quarantine files, etc. Name: python-%{srcname} Version: 0.44 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python package to parse, read and write Microsoft OLE2 files License: BSD @@ -27,7 +27,10 @@ BuildArch: noarch %package -n python2-%{srcname} Summary: %{summary} BuildRequires: python2-devel +# There is python-sphinx in RHEL 7, but it's too old +%if 0%{?fedora} BuildRequires: python2-sphinx +%endif %{?python_provide:%python_provide python2-%{srcname}} %description -n python2-%{srcname} %{_description} @@ -35,13 +38,16 @@ BuildRequires: python2-sphinx Python2 version. -%package -n python3-%{srcname} +%package -n python%{python3_pkgversion}-%{srcname} Summary: %{summary} -BuildRequires: python3-devel -BuildRequires: python3-sphinx -%{?python_provide:%python_provide python3-%{srcname}} +BuildRequires: python%{python3_pkgversion}-devel +# There is no python34-sphinx package in EPEL 7 +%if 0%{?fedora} +BuildRequires: python%{python3_pkgversion}-sphinx +%endif +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} -%description -n python3-%{srcname} %{_description} +%description -n python%{python3_pkgversion}-%{srcname} %{_description} Python3 version. @@ -52,10 +58,14 @@ Python3 version. %build %py2_build +%if 0%{?fedora} make -C doc html BUILDDIR=_build_py2 SPHINXBUILD=sphinx-build-%python2_version +%endif %py3_build +%if 0%{?fedora} make -C doc html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version +%endif %install @@ -71,14 +81,20 @@ make -C doc html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version %files -n python2-%{srcname} -%doc README.md doc/_build_py2/html +%doc README.md +%if 0%{?fedora} +%doc doc/_build_py2/html +%endif %license doc/License.rst %{python2_sitelib}/OleFileIO_PL.py* %{python2_sitelib}/olefile-*.egg-info %{python2_sitelib}/olefile/ -%files -n python3-%{srcname} -%doc README.md doc/_build_py3/html +%files -n python%{python3_pkgversion}-%{srcname} +%doc README.md +%if 0%{?fedora} +%doc doc/_build_py3/html +%endif %license doc/License.rst %{python3_sitelib}/OleFileIO_PL.py* %{python3_sitelib}/__pycache__/OleFileIO_PL.* @@ -87,6 +103,9 @@ make -C doc html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version %changelog +* Wed Oct 04 2017 Robert Scheck - 0.44-4 +- Added spec file conditionals to build for EPEL 7 (#1498616) + * Thu Jul 27 2017 Fedora Release Engineering - 0.44-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild