From 2ae013d914fab69bc7e89ab6270c2e69b87dd505b7924cd9bde1763ea587be0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 8 Apr 2018 06:43:57 +0000 Subject: [PATCH] Accepting request 594555 from home:apersaud:branches:devel:languages:python update to latest version OBS-URL: https://build.opensuse.org/request/show/594555 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=70 --- Pillow-5.0.0.tar.gz | 3 --- Pillow-5.1.0.tar.gz | 3 +++ freetype-2.9.patch | 14 ----------- pillow-non-iterable.patch | 23 ------------------ python-Pillow.changes | 49 +++++++++++++++++++++++++++++++++++++++ python-Pillow.spec | 9 +++---- 6 files changed, 55 insertions(+), 46 deletions(-) delete mode 100644 Pillow-5.0.0.tar.gz create mode 100644 Pillow-5.1.0.tar.gz delete mode 100644 freetype-2.9.patch delete mode 100644 pillow-non-iterable.patch diff --git a/Pillow-5.0.0.tar.gz b/Pillow-5.0.0.tar.gz deleted file mode 100644 index a81203e..0000000 --- a/Pillow-5.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12f29d6c23424f704c66b5b68c02fe0b571504459605cfe36ab8158359b0e1bb -size 14220993 diff --git a/Pillow-5.1.0.tar.gz b/Pillow-5.1.0.tar.gz new file mode 100644 index 0000000..f69d209 --- /dev/null +++ b/Pillow-5.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef +size 14286366 diff --git a/freetype-2.9.patch b/freetype-2.9.patch deleted file mode 100644 index bc35627..0000000 --- a/freetype-2.9.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: Pillow-5.0.0/Tests/test_imagefont.py -=================================================================== ---- Pillow-5.0.0.orig/Tests/test_imagefont.py -+++ Pillow-5.0.0/Tests/test_imagefont.py -@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase): - ('2', '8'): {'multiline': 6.2, - 'textsize': 2.5, - 'getters': (12, 16)}, -+ ('2', '9'): {'multiline': 6.2, -+ 'textsize': 2.5, -+ 'getters': (12, 16)}, - 'Default': {'multiline': 0.5, - 'textsize': 0.5, - 'getters': (12, 16)}, diff --git a/pillow-non-iterable.patch b/pillow-non-iterable.patch deleted file mode 100644 index e82458b..0000000 --- a/pillow-non-iterable.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8edbc79e7f5cf32307caf609b1a346456f8d9fb4 Mon Sep 17 00:00:00 2001 -From: Hugo -Date: Thu, 11 Jan 2018 12:45:52 +0200 -Subject: [PATCH] Fix "TypeError: 'NoneType' object is not iterable" for PPC - and CRUX - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index df80c5d9b..e2c16235b 100755 ---- a/setup.py -+++ b/setup.py -@@ -368,7 +368,7 @@ def build_extensions(self): - - for platform_ in arch_tp: - dirs = libdirs.get(platform_, None) -- if not platform_: -+ if not dirs: - continue - for path in dirs: - _add_directory(library_dirs, path) diff --git a/python-Pillow.changes b/python-Pillow.changes index 7d37852..ce7388a 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Sat Apr 7 19:14:10 UTC 2018 - arun@gmx.de + +- removed freetype-2.9.patch, included upstream +- removed pillow-non-iterable.patch, included upstream + +- update to version 5.1.0: + * Close fp before return in ImagingSavePPM #3061 [kathryndavies] + * Added documentation for ICNS append_images #3051 [radarhere] + * Docs: Move intro text below its header #3021 [hugovk] + * CI: Rename appveyor.yml as .appveyor.yml #2978 [hugovk] + * Fix TypeError for JPEG2000 parser feed #3042 [hugovk] + * Certain corrupted jpegs can result in no data read #3023 + [kkopachev] + * Add support for BLP file format #3007 [jleclanche] + * Simplify version checks #2998 [hugovk] + * Fix "invalid escape sequence" warning on Python 3.6+ #2996 + [timgraham] + * Allow append_images to set .icns scaled images #3005 [radarhere] + * Support appending to existing PDFs #2965 [vashek] + * Fix and improve efficient saving of ICNS on macOS #3004 + [radarhere] + * Build: Enable pip cache in AppVeyor build #3009 [thijstriemstra] + * Trim trailing whitespace #2985 [Metallicow] + * Docs: Correct reference to Image.new method #3000 [radarhere] + * Rearrange ImageFilter classes into alphabetical order #2990 + [radarhere] + * Test: Remove duplicate line #2983 [radarhere] + * Build: Update AppVeyor PyPy version #3003 [radarhere] + * Tiff: Open 8 bit Tiffs with 5 or 6 channels, discarding extra + channels #2938 [homm] + * Readme: Added Twitter badge #2930 [hugovk] + * Removed __main__ code from ImageCms #2942 [radarhere] + * Test: Changed assert statements to unittest calls #2961 + [radarhere] + * Depends: Update libimagequant to 2.11.10, raqm to 0.5.0, freetype + to 2.9 #3036, #3017, #2957 [radarhere] + * Remove _imaging.crc32 in favor of builtin Python crc32 + implementation #2935 [wiredfool] + * Move Tk directory to src directory #2928 [hugovk] + * Enable pip cache in Travis CI #2933 [jdufresne] + * Remove unused and duplicate imports #2927 [radarhere] + * Docs: Changed documentation references to 2.x to 2.7 #2921 + [radarhere] + * Fix memory leak when opening webp files #2974 [wiredfool] + * Setup: Fix "TypeError: 'NoneType' object is not iterable" for PPC + and CRUX #2951 [hugovk] + * Setup: Add libdirs for ppc64le and armv7l #2968 [nehaljwani] + ------------------------------------------------------------------- Mon Jan 15 10:01:18 UTC 2018 - tchvatal@suse.com diff --git a/python-Pillow.spec b/python-Pillow.spec index 25257a5..9baaa21 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -24,16 +24,13 @@ %bcond_with tk %endif Name: python-Pillow -Version: 5.0.0 +Version: 5.1.0 Release: 0 Summary: Python Imaging Library (Fork) License: HPND Group: Development/Languages/Python Url: http://python-imaging.github.io/ Source: https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz -# PATCH-FIX-UPSTREAM freetype-2.9.patch https://github.com/python-pillow/Pillow/issues/2954 -Patch1: freetype-2.9.patch -Patch2: pillow-non-iterable.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module olefile} BuildRequires: %{python_module pytest-runner} @@ -96,7 +93,6 @@ Python Imaging Library by Fredrik Lundh and Contributors. %prep %setup -q -n Pillow-%{version} -%autopatch -p1 %build %python_build @@ -122,7 +118,8 @@ $python setup.py test } %files %{python_files} -%doc CHANGES.rst README.rst LICENSE +%license LICENSE +%doc CHANGES.rst README.rst %{python_sitearch}/PIL %{python_sitearch}/PIL.pth %{python_sitearch}/Pillow-%{version}-py%{python_version}.egg-info