From 2012600bc26a9ef8e31bb312567d1b499922a717b300006cb7de351022b43e4c Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Tue, 28 Jan 2014 09:23:11 +0000
Subject: [PATCH] Accepting request 215203 from home:kohtala:reviewboard

Revised update to 2.3.0.

OBS-URL: https://build.opensuse.org/request/show/215203
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=8
---
 Pillow-2.2.1.zip                       |  3 ---
 Pillow-2.3.0.zip                       |  3 +++
 python-Pillow.changes                  |  9 +++++++++
 python-Pillow.spec                     | 10 +++-------
 use-recommended-freetype-include.patch | 15 ---------------
 5 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 Pillow-2.2.1.zip
 create mode 100644 Pillow-2.3.0.zip
 delete mode 100644 use-recommended-freetype-include.patch

diff --git a/Pillow-2.2.1.zip b/Pillow-2.2.1.zip
deleted file mode 100644
index 75bd80e..0000000
--- a/Pillow-2.2.1.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8440145d6e08db16f2a03b134b057c4524809e18a06cc8fe0e5e885dc4d8969
-size 2231597
diff --git a/Pillow-2.3.0.zip b/Pillow-2.3.0.zip
new file mode 100644
index 0000000..6ca4d58
--- /dev/null
+++ b/Pillow-2.3.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b38e7e32401ae2d949cb4b82c6388cd13e697d1e2f8a1bffce3b834d00fbca13
+size 2421241
diff --git a/python-Pillow.changes b/python-Pillow.changes
index 367e658..dc74d55 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jan  7 19:19:05 UTC 2014 - marko.kohtala@gmail.com
+
+- New upstream release 2.3.0. For details see
+  https://pypi.python.org/pypi/Pillow/2.3.0
+- Drop use-recommended-freetype-include.patch: merged on upstream
+- Build with liblcms2 instead of liblcms due to upstream switching
+  library.
+
 -------------------------------------------------------------------
 Wed Dec 11 20:08:40 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index 25d437f..ebb3d8a 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-Pillow
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,13 @@
 
 
 Name:           python-Pillow
-Version:        2.2.1
+Version:        2.3.0
 Release:        0
 Summary:        Python Imaging Library (Fork)
 License:        HPND
 Group:          Development/Languages/Python
 Url:            http://python-imaging.github.io/
 Source:         https://pypi.python.org/packages/source/P/Pillow/Pillow-%{version}.zip
-# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
-# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
-Patch0:         use-recommended-freetype-include.patch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-tk
@@ -38,7 +35,7 @@ BuildRequires:  libjpeg8-devel
 BuildRequires:  libwebp-devel
 %endif
 BuildRequires:  freetype2-devel
-BuildRequires:  liblcms-devel
+BuildRequires:  liblcms2-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  zlib-devel
 Requires(post): update-alternatives
@@ -77,7 +74,6 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 
 %prep
 %setup -q -n Pillow-%{version}
-%patch0 -p1
 
 %build
 CFLAGS="%{optflags}" python setup.py build
diff --git a/use-recommended-freetype-include.patch b/use-recommended-freetype-include.patch
deleted file mode 100644
index eca6bb5..0000000
--- a/use-recommended-freetype-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur Pillow-2.2.1.orig/_imagingft.c Pillow-2.2.1/_imagingft.c
---- Pillow-2.2.1.orig/_imagingft.c	2013-10-02 12:58:22.000000000 +0200
-+++ Pillow-2.2.1/_imagingft.c	2013-12-11 21:07:17.433282578 +0100
-@@ -59,7 +59,11 @@
-     const char* message;
- } ft_errors[] =
- 
-+#if defined(USE_FREETYPE_2_1)
-+#include FT_ERRORS_H
-+#else
- #include <freetype/fterrors.h>
-+#endif
- 
- /* -------------------------------------------------------------------- */
- /* font objects */