From ba30a4fd5ae4f8b736be950b4eb36c0e7fb31eda Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 4 Jan 2016 15:11:12 +0100
Subject: [PATCH] Update to 3.1.0

---
 .gitignore                                    |  1 +
 ...8b522022bfedf3d257fa4b3ff7259642cd01.patch | 22 +++++++++++++++++++
 python-pillow.spec                            | 13 ++++++++---
 sources                                       |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 255a8b522022bfedf3d257fa4b3ff7259642cd01.patch

diff --git a/.gitignore b/.gitignore
index 784123d..a55c3f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /python-pillow-Pillow-2.8.2-0-g0222a05.tar.gz
 /python-pillow-Pillow-2.9.0-0-g80672b6.tar.gz
 /python-pillow-Pillow-3.0.0-0-g0177cce.tar.gz
+/python-pillow-Pillow-3.1.0-0-gfff5536.tar.gz
diff --git a/255a8b522022bfedf3d257fa4b3ff7259642cd01.patch b/255a8b522022bfedf3d257fa4b3ff7259642cd01.patch
new file mode 100644
index 0000000..fad3bc4
--- /dev/null
+++ b/255a8b522022bfedf3d257fa4b3ff7259642cd01.patch
@@ -0,0 +1,22 @@
+From 255a8b522022bfedf3d257fa4b3ff7259642cd01 Mon Sep 17 00:00:00 2001
+From: Sandro Mani <manisandro@gmail.com>
+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 d32d617..6ce25dd 100644
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -17,7 +17,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 0177cceac4adfd0020ecbf49fb44ad275dcc1f51
+%global commit fff5536b37c2d619c66c1189b6925fa0a8df3822
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ahead 0
 
@@ -27,8 +27,8 @@
 %endif
 
 Name:           python-pillow
-Version:        3.0.0
-Release:        5%{?snap}%{?dist}
+Version:        3.1.0
+Release:        1%{?snap}%{?dist}
 Summary:        Python image processing library
 
 # License: see http://www.pythonware.com/products/pil/license.htm
@@ -39,6 +39,9 @@ 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
@@ -189,6 +192,7 @@ 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
@@ -342,6 +346,9 @@ popd
 %endif
 
 %changelog
+* Mon Jan 04 2016 Sandro Mani <manisandro@gmail.com> - 3.1.0-1
+- Update to 3.1.0
+
 * Tue Dec 29 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.0.0-5
 - Build with docs
 
diff --git a/sources b/sources
index ed573e8..5e69e2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8821a035476fa50f18b6092a0a420d78  python-pillow-Pillow-3.0.0-0-g0177cce.tar.gz
+7cc1a907d913b8c6edba829f9744a652  python-pillow-Pillow-3.1.0-0-gfff5536.tar.gz