diff --git a/.gitignore b/.gitignore index fc2de8a..1e6628c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /python-pillow-Pillow-3.0.0-0-g0177cce.tar.gz /python-pillow-Pillow-3.1.0-0-gfff5536.tar.gz /python-pillow-Pillow-3.1.1-0-geb72bf8.tar.gz +/python-pillow-Pillow-3.2.0-0-g344cb70.tar.gz diff --git a/255a8b522022bfedf3d257fa4b3ff7259642cd01.patch b/255a8b522022bfedf3d257fa4b3ff7259642cd01.patch deleted file mode 100644 index fad3bc4..0000000 --- a/255a8b522022bfedf3d257fa4b3ff7259642cd01.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 255a8b522022bfedf3d257fa4b3ff7259642cd01 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Mon, 4 Jan 2016 13:44:24 +0100 -Subject: [PATCH] Fix incorrect conditional - ---- - encode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/encode.c b/encode.c -index fef1021..63220b7 100644 ---- a/encode.c -+++ b/encode.c -@@ -54,7 +54,7 @@ PyImaging_EncoderNew(int contextsize) - ImagingEncoderObject *encoder; - void *context; - -- if(!PyType_Ready(&ImagingEncoderType) < 0) -+ if(PyType_Ready(&ImagingEncoderType) < 0) - return NULL; - - encoder = PyObject_New(ImagingEncoderObject, &ImagingEncoderType); diff --git a/python-pillow.spec b/python-pillow.spec index 55ff2da..f41e80f 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -14,7 +14,7 @@ # Refer to the comment for Source0 below on how to obtain the source tarball # The saved file has format python-pillow-Pillow-$version-$ahead-g$shortcommit.tar.gz -%global commit eb72bf86fb867841f8a9e192e43e511bf4618709 +%global commit 344cb709ed0111adcc6ad47cc007507c3f5efeb3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ahead 0 @@ -24,8 +24,8 @@ %endif Name: python-pillow -Version: 3.1.1 -Release: 3%{?snap}%{?dist} +Version: 3.2.0 +Release: 1%{?snap}%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -36,9 +36,6 @@ URL: http://python-pillow.github.io/ # wget --content-disposition https://github.com/python-pillow/Pillow/tarball/$commit Source0: https://github.com/python-pillow/Pillow/tarball/%{commit}/python-pillow-Pillow-%{version}-%{ahead}-g%{shortcommit}.tar.gz -# Backport upstream commit to fix incorrect conditional -Patch0: 255a8b522022bfedf3d257fa4b3ff7259642cd01.patch - BuildRequires: tk-devel BuildRequires: libjpeg-devel BuildRequires: zlib-devel @@ -197,20 +194,10 @@ PIL image wrapper for Qt. %prep %setup -q -n python-pillow-Pillow-%{shortcommit} -%patch0 -p1 # Strip shebang on non-executable file sed -i 1d PIL/OleFileIO.py -# Fix file encoding -iconv --from=ISO-8859-1 --to=UTF-8 PIL/WalImageFile.py > PIL/WalImageFile.py.new && \ -touch -r PIL/WalImageFile.py PIL/WalImageFile.py.new && \ -mv PIL/WalImageFile.py.new PIL/WalImageFile.py - -# Make sample scripts non-executable -chmod -x Scripts/diffcover-run.sh -chmod -x Scripts/diffcover-install.sh - %if %{with_python3} # Create Python 3 source tree rm -rf %{py3dir} @@ -357,6 +344,9 @@ popd %endif %changelog +* Fri Apr 01 2016 Sandro Mani - 3.2.0-1 +- Update to 3.2.0 + * Wed Feb 10 2016 Sandro Mani - 3.1.1-3 - Fix broken python3-pillow package description diff --git a/sources b/sources index 0ec9e40..d0597d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4450f0f2e7d32b1abd2bf3d11b9ab7d1 python-pillow-Pillow-3.1.1-0-geb72bf8.tar.gz +6c3a56023079f4227509050b482c4fff python-pillow-Pillow-3.2.0-0-g344cb70.tar.gz