From 62bc3704b941a0ca118417f7e7a81b0de73d48e1 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 22 Mar 2013 18:19:06 +0100
Subject: [PATCH] Add python3-imaging provides, new git snapshot with
 upstreamed patch

---
 .gitignore                   |  1 +
 python-pillow.spec           | 17 +++++++++++------
 python-pillow_tempfile.patch | 12 ------------
 sources                      |  2 +-
 4 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 python-pillow_tempfile.patch

diff --git a/.gitignore b/.gitignore
index b797b34..b6af56a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /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
+/python-imaging-Pillow-2.0.0-28-gde210a2.tar.gz
diff --git a/python-pillow.spec b/python-pillow.spec
index 551ad7a..0d14b18 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 2e888483a6291992f70011f7f95b893911d47d8f
+%global commit de210a2e2105e44e6cd98114b40fb3c91ef56806
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ahead 26
+%global ahead 28
 
 # 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:        2%{?snap}%{?dist}
+Release:        3%{?snap}%{?dist}
 Summary:        Python 2 image processing library
 
 # License: see http://www.pythonware.com/products/pil/license.htm
@@ -32,8 +32,6 @@ Source0:        https://github.com/python-imaging/Pillow/tarball/%{commit}/pytho
 Patch0:         python-pillow-archs.patch
 # The shipped lena_webp_wrote.ppm is wrong
 Patch1:         python-pillow_webp-test.patch
-# Prevent a temporary file from entering the package
-Patch2:         python-pillow_tempfile.patch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
@@ -56,6 +54,10 @@ BuildRequires:  python3-tkinter
 Provides:       python-imaging = %{version}-%{release}
 Obsoletes:      python-imaging <= 1.1.7-12
 
+%if %{with_python3}
+Provides:       python3-imaging = %{version}-%{release}
+%endif
+
 %filter_provides_in %{python_sitearch}
 %filter_provides_in %{python3_sitearch}
 %filter_setup
@@ -170,7 +172,6 @@ Tk interface for %{name3}.
 %setup -q -n python-imaging-Pillow-%{shortcommit}
 %patch0 -p1 -b .archs
 %patch1 -p1 -b .lena
-%patch2 -p1 -b .tempfile
 
 %if %{with_python3}
 # Create Python 3 source tree
@@ -317,6 +318,10 @@ popd
 %endif
 
 %changelog
+* Fri Mar 22 2013 Sandro Mani <manisandro@gmail.com> - 2.0.0-3.gitde210a2
+- python-pillow_tempfile.patch now upstream
+- Add python3-imaging provides (bug #924867)
+
 * 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
diff --git a/python-pillow_tempfile.patch b/python-pillow_tempfile.patch
deleted file mode 100644
index e15f39a..0000000
--- a/python-pillow_tempfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN python-imaging-Pillow-2e88848/Tests/test_file_tiff.py python-imaging-Pillow-2e88848-new/Tests/test_file_tiff.py
---- python-imaging-Pillow-2e88848/Tests/test_file_tiff.py	2013-03-21 21:22:46.000000000 +0100
-+++ python-imaging-Pillow-2e88848-new/Tests/test_file_tiff.py	2013-03-22 01:42:06.912892607 +0100
-@@ -126,7 +126,7 @@ def test_g4_write():
-     file = "Tests/images/lena_g4_500.tif"
-     orig = Image.open(file)
- 
--    out = "temp.tif"
-+    out = tempfile("temp.tif")
-     rot = orig.transpose(Image.ROTATE_90)
-     assert_equal(rot.size,(500,500))
-     rot.save(out)
diff --git a/sources b/sources
index b975692..5e4ddf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6242e6ea5d3573927dce00f14a0b4439  python-imaging-Pillow-2.0.0-26-g2e88848.tar.gz
+f9fe02d98911fcc902a62367b84c5f53  python-imaging-Pillow-2.0.0-28-gde210a2.tar.gz