From 68e0c58e4ab6433e1866700fd6299ac572288642 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 22 Mar 2013 00:45:59 +0100
Subject: [PATCH] Update to latest git

---
 .gitignore                       |  1 +
 python-pillow-disable-test.patch |  9 ---------
 python-pillow.spec               | 13 +++++++------
 sources                          |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 python-pillow-disable-test.patch

diff --git a/.gitignore b/.gitignore
index f84a827..b797b34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /python-imaging-Pillow-1.7.8-137-g7866759.tar.gz
 /python-imaging-Pillow-2.0.0-11-g2f4207c.tar.gz
+/python-imaging-Pillow-2.0.0-26-g2e88848.tar.gz
diff --git a/python-pillow-disable-test.patch b/python-pillow-disable-test.patch
deleted file mode 100644
index 16557eb..0000000
--- a/python-pillow-disable-test.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -rupN python-imaging-Pillow-2f4207c/Tests/test_image_filter.py python-imaging-Pillow-2f4207c-new/Tests/test_image_filter.py
---- python-imaging-Pillow-2f4207c/Tests/test_image_filter.py	2013-03-18 22:22:00.000000000 +0100
-+++ python-imaging-Pillow-2f4207c-new/Tests/test_image_filter.py	2013-03-19 00:54:13.186055355 +0100
-@@ -79,4 +79,4 @@ def test_rankfilter():
-     assert_exception(ValueError, lambda: rankfilter("P"))
-     assert_equal(rankfilter("RGB"), ((0, 0, 0), (4, 0, 0), (8, 0, 0)))
-     assert_equal(rankfilter("I"), (0, 4, 8))
--    assert_equal(rankfilter("F"), (0.0, 4.0, 8.0))
-+    #assert_equal(rankfilter("F"), (0.0, 4.0, 8.0))
diff --git a/python-pillow.spec b/python-pillow.spec
index 162fafb..fe7e6f2 100644
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -6,9 +6,9 @@
 
 # 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
-%global commit 2f4207c0d75150f9009fe23e9134eea34b893518
+%global commit 2e888483a6291992f70011f7f95b893911d47d8f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ahead 11
+%global ahead 26
 
 # If ahead is 0, the tarball corresponds to a release version, otherwise to a git snapshot
 %if %{ahead} > 0
@@ -17,7 +17,7 @@
 
 Name:           python-pillow
 Version:        2.0.0
-Release:        1%{?snap}%{?dist}
+Release:        2%{?snap}%{?dist}
 Summary:        Python 2 image processing library
 
 # License: see http://www.pythonware.com/products/pil/license.htm
@@ -30,8 +30,6 @@ Source0:        https://github.com/python-imaging/Pillow/tarball/%{commit}/pytho
 
 # Add s390* and ppc* archs
 Patch0:         python-pillow-archs.patch
-# Comment out a particular test which hangs due to a gcc4.8 regression
-Patch1:         python-pillow-disable-test.patch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
@@ -167,7 +165,6 @@ Tk interface for %{name3}.
 %prep
 %setup -q -n python-imaging-Pillow-%{shortcommit}
 %patch0 -p1 -b .archs
-%patch1 -p1 -b .test
 
 %if %{with_python3}
 # Create Python 3 source tree
@@ -314,6 +311,10 @@ popd
 %endif
 
 %changelog
+* Fri Mar 22 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-2.git2e88848
+- Update to latest git
+- Remove python-pillow-disable-test.patch, gcc is now fixed
+
 * Tue Mar 19 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-1.git2f4207c
 - Update to 2.0.0 git snapshot
 - Enable python3 packages
diff --git a/sources b/sources
index 4870cbb..b975692 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aa70bf34aaa01ad9680dd22fe028f16  python-imaging-Pillow-2.0.0-11-g2f4207c.tar.gz
+6242e6ea5d3573927dce00f14a0b4439  python-imaging-Pillow-2.0.0-26-g2e88848.tar.gz