diff --git a/0001-Ico-files-are-little-endian-ref-1204.patch b/0001-Ico-files-are-little-endian-ref-1204.patch deleted file mode 100644 index 6cdc4ad..0000000 --- a/0001-Ico-files-are-little-endian-ref-1204.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 93461e6faa9a5a2676101394bd2fae68040f6b53 Mon Sep 17 00:00:00 2001 -From: Eric Soroos -Date: Wed, 13 May 2015 03:05:45 -0700 -Subject: [PATCH] Ico files are little endian, ref #1204 - ---- - PIL/IcoImagePlugin.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: Pillow-2.8.1/PIL/IcoImagePlugin.py -=================================================================== ---- Pillow-2.8.1.orig/PIL/IcoImagePlugin.py -+++ Pillow-2.8.1/PIL/IcoImagePlugin.py -@@ -49,7 +49,7 @@ def _save(im, fp, filename): - filter(lambda x: False if (x[0] > width or x[1] > height or - x[0] > 255 or x[1] > 255) else True, sizes) - sizes = sorted(sizes, key=lambda x: x[0]) -- fp.write(struct.pack("H", len(sizes))) # idCount(2) -+ fp.write(struct.pack(" QImage; Image <-> QPixmap #1217 + * Remove duplicate code in gifmaker script #1294 + * Multiline text in ImageDraw #1177 + * Automated Windows CI/build support #1278 + * Removed support for Tk versions earlier than 8.4 #1288 + * Fixed polygon edge drawing #1255 (fixes #1252) + * Check prefix length in _accept methods #1267 + * Register MIME type for BMP #1277 + * Adjusted ImageQt use of unicode() for 2/3 compatibility #1218 + * Identify XBM file created with filename including underscore #1230 (fixes #1229) + * Copy image when saving in GifImagePlugin #1231 (fixes #718) + * Removed support for FreeType 2.0 #1247 + * Added background saving to GifImagePlugin #1273 + * Provide n_frames attribute to multi-frame formats #1261 + * Add duration and loop set to GifImagePlugin #1172, #1269 + * Ico files are little endian #1232 + * Upgrade olefile from 0.30 to 0.42b #1226 + * Setting transparency value to 0 when the tRNS contains only null byte(s) #1239 + * Separated out feature checking from selftest #1233 + * Style/health fixes + * Update WebP from 0.4.1 to 0.4.3 #1235 + * Release GIL during image load (decode) #1224 + * Added icns save #1185 + * Fix putdata memory leak #1196 + * Keep user-specified ordering of icon sizes #1193 + * Tiff: allow writing floating point tag values #1113 +- Update to 2.8.2: + * Bug fix: Fixed Tiff handling of bad EXIF data +- Remove 0001-Ico-files-are-little-endian-ref-1204.patch: merged upstream +- Remove fix-textsize-equal.patch: merged upstream + +------------------------------------------------------------------- +Mon Jul 27 08:55:33 UTC 2015 - seife+obs@b1-systems.com + +- fix build and dependencies for RHEL/CentOS 7 + ------------------------------------------------------------------- Sat Jun 13 19:02:32 UTC 2015 - dmueller@suse.com diff --git a/python-Pillow.spec b/python-Pillow.spec index 447abd6..bd71ade 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -17,15 +17,13 @@ Name: python-Pillow -Version: 2.8.1 +Version: 2.9.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}.tar.gz -Patch1: fix-textsize-equal.patch -Patch2: 0001-Ico-files-are-little-endian-ref-1204.patch BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: python-tk @@ -37,8 +35,14 @@ BuildRequires: libjpeg8-devel BuildRequires: liblcms2-devel BuildRequires: libwebp-devel %else +%if 0%{?rhel} > 6 +BuildRequires: lcms2-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: libwebp-devel +%else BuildRequires: python-unittest2 %endif +%endif %if 0%{?suse_version} > 1315 BuildRequires: openjpeg2-devel %endif @@ -87,8 +91,6 @@ Python Imaging Library by Fredrik Lundh and Contributors. %prep %setup -q -n Pillow-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build