Accepting request 215352 from devel:languages:python

Revised update to 2.3.0. (forwarded request 215203 from kohtala)

OBS-URL: https://build.opensuse.org/request/show/215352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Pillow?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2014-01-29 06:16:50 +00:00 committed by Git OBS Bridge
commit a6c5e5361c
5 changed files with 15 additions and 25 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8440145d6e08db16f2a03b134b057c4524809e18a06cc8fe0e5e885dc4d8969
size 2231597

3
Pillow-2.3.0.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b38e7e32401ae2d949cb4b82c6388cd13e697d1e2f8a1bffce3b834d00fbca13
size 2421241

View File

@ -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

View File

@ -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

View File

@ -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 */