From 56f84ea87d36e60fd53c39ec6125870180545156 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 3 Jan 2021 10:37:43 +0000 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#fcfbaa5af4e0ba74aaaf114cc325e2605e02ab65 --- .gitignore | 1 + python-pillow.spec | 10 ++++++---- python-pillow_sphinx-issues.patch | 11 +++++++++++ python-pillow_spinxwarn.patch | 6 +++--- sources | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 python-pillow_sphinx-issues.patch diff --git a/.gitignore b/.gitignore index b8ee9c2..4af3250 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /Pillow-7.2.0.tar.gz /Pillow-8.0.0.tar.gz /Pillow-8.0.1.tar.gz +/Pillow-8.1.0.tar.gz diff --git a/python-pillow.spec b/python-pillow.spec index caf8571..c5144fc 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -7,8 +7,8 @@ %global with_docs 1 Name: python-%{srcname} -Version: 8.0.1 -Release: 1.1%{?dist} +Version: 8.1.0 +Release: 1%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -18,6 +18,8 @@ Source0: https://github.com/python-pillow/Pillow/archive/%{version}/Pillo # Don't error out if sphinx warnings occur Patch0: python-pillow_spinxwarn.patch +# Drop sphinx-issues requirement, it's not packaged for Fedora +Patch1: python-pillow_sphinx-issues.patch BuildRequires: freetype-devel BuildRequires: gcc @@ -186,8 +188,8 @@ popd %changelog -* Sat Dec 19 2020 Petr Ĺ abata - 8.0.1-1.1 -- Bump for gcc11 +* Sun Jan 03 2021 Sandro Mani - 8.1.0-1 +- Update to 8.1.0 * Fri Oct 23 2020 Sandro Mani - 8.0.1-1 - Update to 8.0.1 diff --git a/python-pillow_sphinx-issues.patch b/python-pillow_sphinx-issues.patch new file mode 100644 index 0000000..9f9c7a9 --- /dev/null +++ b/python-pillow_sphinx-issues.patch @@ -0,0 +1,11 @@ +diff -rupN Pillow-8.1.0/docs/conf.py Pillow-8.1.0-new/docs/conf.py +--- Pillow-8.1.0/docs/conf.py 2021-01-02 12:39:02.000000000 +0100 ++++ Pillow-8.1.0-new/docs/conf.py 2021-01-03 11:03:45.488353823 +0100 +@@ -32,7 +32,6 @@ extensions = [ + "sphinx.ext.autodoc", + "sphinx.ext.intersphinx", + "sphinx.ext.viewcode", +- "sphinx_issues", + "sphinx_removed_in", + ] + diff --git a/python-pillow_spinxwarn.patch b/python-pillow_spinxwarn.patch index 1ec5efd..6a37dec 100644 --- a/python-pillow_spinxwarn.patch +++ b/python-pillow_spinxwarn.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference Pillow-8.1.0/docs/Makefile Pillow-8.1.0-new/docs/Makefile +--- Pillow-8.1.0/docs/Makefile 2021-01-02 12:39:02.000000000 +0100 ++++ Pillow-8.1.0-new/docs/Makefile 2021-01-03 10:55:47.317076044 +0100 @@ -42,7 +42,7 @@ clean: -rm -rf $(BUILDDIR)/* diff --git a/sources b/sources index 1fb984f..3695dfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Pillow-8.0.1.tar.gz) = 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a +SHA512 (Pillow-8.1.0.tar.gz) = 1014271d29e98c465e6882ed3f2f915f8955f5ada2a762c671a1f79389b25576ead2d144c6eaf42b4777f14438d15979d78d34dc32d984fd7defb53f0d209957