From b0fd5fecd17c3ba87b3ad7c62156b5a6ad16fae4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 10 Mar 2019 23:32:25 +0100 Subject: [PATCH] Drop python2-pillow-doc --- python-pillow.spec | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/python-pillow.spec b/python-pillow.spec index 02d6091..7a990c7 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -14,7 +14,7 @@ Name: python-%{srcname} Version: 5.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -40,10 +40,6 @@ BuildRequires: python2-numpy BuildRequires: python2-olefile BuildRequires: python2-PyQt4 BuildRequires: python2-setuptools -%if 0%{?with_docs} -BuildRequires: python2-sphinx -BuildRequires: python2-sphinx_rtd_theme -%endif # with_docs BuildRequires: python2-tkinter %if 0%{?with_python3} @@ -106,18 +102,6 @@ Provides: python2-imaging-devel = %{version}-%{release} Development files for %{srcname}. -%package -n python2-%{srcname}-doc -Summary: Documentation for %{srcname} -BuildArch: noarch -Requires: python2-%{srcname} = %{version}-%{release} -%{?python_provide:%python_provide python2-%{srcname}-doc} -Provides: python-imaging-doc = %{version}-%{release} -Provides: python2-imaging-doc = %{version}-%{release} - -%description -n python2-%{srcname}-doc -Documentation for %{srcname}. - - %package -n python2-%{srcname}-tk Summary: Tk interface for %{srcname} Requires: python2-tkinter @@ -177,6 +161,7 @@ BuildArch: noarch Requires: python3-%{srcname} = %{version}-%{release} %{?python_provide:%python_provide python3-%{srcname}-doc} Provides: python3-imaging-doc = %{version}-%{release} +Obsoletes: python2-%{srcname}-doc %description -n python3-%{srcname}-doc Documentation for %{srcname}. @@ -213,11 +198,6 @@ Qt %{srcname} image wrapper. # Build Python 2 modules %py2_build -%if 0%{?with_docs} -PYTHONPATH=$PWD/build/%py2_libbuilddir make -C docs html BUILDDIR=_build_py2 SPHINXBUILD=sphinx-build-%python2_version -rm -f docs/_build_py2/html/.buildinfo -%endif # with_docs - %if 0%{?with_python3} # Build Python 3 modules %py3_build @@ -276,11 +256,6 @@ popd %files -n python2-%{srcname}-devel %{py2_incdir}/Imaging/ -%files -n python2-%{srcname}-doc -%if 0%{?with_docs} -%doc docs/_build_py2/html -%endif # with_docs - %files -n python2-%{srcname}-tk %{python2_sitearch}/PIL/_imagingtk* %{python2_sitearch}/PIL/ImageTk* @@ -325,6 +300,9 @@ popd %changelog +* Sun Mar 10 2019 Sandro Mani - 5.4.1-4 +- Drop python2-pillow-doc + * Mon Mar 04 2019 Yatin Karel - 5.4.1-3 - Fix python3 conditional