From e6d8cbdaaa1fdbcf1d94aff355ad7940db05c7e9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 11 Mar 2019 11:11:07 +0100 Subject: [PATCH] Drop docs in python2 build --- python-olefile.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-olefile.spec b/python-olefile.spec index 10de0b3..dc2a8fd 100644 --- a/python-olefile.spec +++ b/python-olefile.spec @@ -9,7 +9,7 @@ antivirus quarantine files, etc. Name: python-%{srcname} Version: 0.46 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python package to parse, read and write Microsoft OLE2 files License: BSD @@ -25,8 +25,8 @@ 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} +# There is python-sphinx in RHEL 7, but it's too old. Fedora >= 31 does not have python2-sphinx anymore. +%if 0%{?fedora} && 0%{?fedora} < 31 BuildRequires: python2-sphinx %endif %{?python_provide:%python_provide python2-%{srcname}} @@ -56,7 +56,7 @@ Python3 version. %build %py2_build -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?fedora} < 31 make -C doc html BUILDDIR=_build_py2 SPHINXBUILD=sphinx-build-%python2_version %endif @@ -80,7 +80,7 @@ make -C doc html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version %files -n python2-%{srcname} %doc README.md -%if 0%{?fedora} +%if 0%{?fedora} && 0%{?fedora} < 31 %doc doc/_build_py2/html %endif %license doc/License.rst @@ -98,6 +98,9 @@ make -C doc html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version %changelog +* Mon Mar 11 2019 Sandro Mani - 0.46-3 +- Drop docs in python2 build + * Sat Feb 02 2019 Fedora Release Engineering - 0.46-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild