From f032b14bb4067d0f2c0cee1b1f7c65f515200fe2 Mon Sep 17 00:00:00 2001
From: Roman Rakus <rrakus@redhat.com>
Date: Sat, 11 May 2013 22:53:10 +0200
Subject: [PATCH 1/2] Conditionaly disable build of python3 parts on RHEL
 system

Signed-off-by: Roman Rakus <rrakus@redhat.com>
---
 python-pillow.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/python-pillow.spec b/python-pillow.spec
index e4b8042..71c4405 100644
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -2,7 +2,13 @@
 %global py3_incdir %{_includedir}/python%{python3_version}
 
 %global name3 python3-pillow
-%global with_python3 1
+
+# RHEL-7 doesn't have python 3
+%if 0%{?rhel} == 7
+  %global with_python3 0
+%else
+  %global with_python3 1
+%endif
 
 # Refer to the comment for Source0 below on how to obtain the source tarball
 # The saved file has format python-imaging-Pillow-$version-$ahead-g$shortcommit.tar.gz
@@ -17,7 +23,7 @@
 
 Name:           python-pillow
 Version:        2.0.0
-Release:        8%{?snap}%{?dist}
+Release:        9%{?snap}%{?dist}
 Summary:        Python image processing library
 
 # License: see http://www.pythonware.com/products/pil/license.htm
@@ -353,6 +359,9 @@ popd
 %endif
 
 %changelog
+* Sat May 11 2013 Roman Rakus <rrakus@redhat.com> - 2.0.0-9.gitd1c6db8
+- Conditionaly disable build of python3 parts on RHEL system
+
 * Wed May 08 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-8.gitd1c6db8
 - Add patch to fix test failure on big-endian
 

From 923f341e9547d58f0c4f8cc4596f65c938e740f4 Mon Sep 17 00:00:00 2001
From: Roman Rakus <rrakus@redhat.com>
Date: Mon, 13 May 2013 22:14:19 +0200
Subject: [PATCH 2/2] Build without webp support on s390* archs

Resolves: rhbz#962059

Signed-off-by: Roman Rakus <rrakus@redhat.com>
---
 python-pillow.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/python-pillow.spec b/python-pillow.spec
index 71c4405..0f590bd 100644
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -23,7 +23,7 @@
 
 Name:           python-pillow
 Version:        2.0.0
-Release:        9%{?snap}%{?dist}
+Release:        10%{?snap}%{?dist}
 Summary:        Python image processing library
 
 # License: see http://www.pythonware.com/products/pil/license.htm
@@ -49,7 +49,11 @@ BuildRequires:  zlib-devel
 BuildRequires:  freetype-devel
 BuildRequires:  lcms-devel
 BuildRequires:  sane-backends-devel
+# Don't build with webp support on s390* archs
+# see bug #962091
+%ifnarch s390 s390x
 BuildRequires:  libwebp-devel
+%endif
 BuildRequires:  PyQt4
 BuildRequires:  numpy
 
@@ -359,6 +363,10 @@ popd
 %endif
 
 %changelog
+* Mon May 13 2013 Roman Rakus <rrakus@redhat.com> - 2.0.0-10
+- Build without webp support on s390* archs
+  Resolves: rhbz#962059
+
 * Sat May 11 2013 Roman Rakus <rrakus@redhat.com> - 2.0.0-9.gitd1c6db8
 - Conditionaly disable build of python3 parts on RHEL system