From 702a994def22edd964b203d055d325a9e1798ad2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 21:59:04 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/python-pillow.git#c46f189dedd51e9495b011b6a89ba4e3be72c5bf --- .gitignore | 2 ++ python-pillow.spec | 16 +++++++++++++--- python-pillow_spinxwarn.patch | 12 ++++++++++++ sources | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 python-pillow_spinxwarn.patch diff --git a/.gitignore b/.gitignore index 057e6be..b8ee9c2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ /Pillow-7.1.1.tar.gz /Pillow-7.1.2.tar.gz /Pillow-7.2.0.tar.gz +/Pillow-8.0.0.tar.gz +/Pillow-8.0.1.tar.gz diff --git a/python-pillow.spec b/python-pillow.spec index dc4cd6a..818ddfc 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -7,8 +7,8 @@ %global with_docs 1 Name: python-%{srcname} -Version: 7.2.0 -Release: 2%{?dist} +Version: 8.0.1 +Release: 1%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -16,6 +16,9 @@ License: MIT URL: http://python-pillow.github.io/ Source0: https://github.com/python-pillow/Pillow/archive/%{version}/Pillow-%{version}.tar.gz +# Don't error out if sphinx warnings occur +Patch0: python-pillow_spinxwarn.patch + BuildRequires: freetype-devel BuildRequires: gcc BuildRequires: ghostscript @@ -38,6 +41,7 @@ BuildRequires: python3-setuptools %if 0%{?with_docs} BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme +BuildRequires: python3-sphinx-removed-in %endif BuildRequires: python3-tkinter @@ -149,7 +153,7 @@ popd %files -n python3-%{srcname} -%doc README.rst CHANGES.rst +%doc README.md CHANGES.rst %license docs/COPYING %{python3_sitearch}/* # These are in subpackages @@ -182,6 +186,12 @@ popd %changelog +* Fri Oct 23 2020 Sandro Mani - 8.0.1-1 +- Update to 8.0.1 + +* Thu Oct 15 2020 Sandro Mani - 8.0.0-1 +- Update to 8.0.0 + * Wed Jul 29 2020 Fedora Release Engineering - 7.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/python-pillow_spinxwarn.patch b/python-pillow_spinxwarn.patch new file mode 100644 index 0000000..1ec5efd --- /dev/null +++ b/python-pillow_spinxwarn.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference Pillow-8.0.1/docs/Makefile Pillow-8.0.1-new/docs/Makefile +--- Pillow-8.0.1/docs/Makefile 2020-10-22 17:05:53.000000000 +0200 ++++ Pillow-8.0.1-new/docs/Makefile 2020-10-23 13:59:47.536824451 +0200 +@@ -42,7 +42,7 @@ clean: + -rm -rf $(BUILDDIR)/* + + html: +- $(SPHINXBUILD) -b html -W --keep-going $(ALLSPHINXOPTS) $(BUILDDIR)/html ++ $(SPHINXBUILD) -b html --keep-going $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + diff --git a/sources b/sources index 83689c9..1fb984f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Pillow-7.2.0.tar.gz) = ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b +SHA512 (Pillow-8.0.1.tar.gz) = 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a