From bdb781997f9fdb938e17920f23251aacdfd2f341 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 28 May 2014 00:18:45 +0200 Subject: [PATCH] Update openjpeg-2.1.0 patch, re-enable docs --- python-pillow.spec | 8 ++++++-- python-pillow_openjpeg-2.1.0.patch | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python-pillow.spec b/python-pillow.spec index 3a747d7..c2d08cf 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -6,7 +6,7 @@ %global name3 python3-pillow # bootstrap building docs (pillow is required by docutils, docutils are # required by sphinx; pillow build-requires sphinx) -%global with_docs 0 +%global with_docs 1 # RHEL-7 doesn't have python 3 %if 0%{?rhel} == 7 @@ -28,7 +28,7 @@ Name: python-pillow Version: 2.4.0 -Release: 9%{?snap}%{?dist} +Release: 10%{?snap}%{?dist} Summary: Python image processing library # License: see http://www.pythonware.com/products/pil/license.htm @@ -388,6 +388,10 @@ popd %endif %changelog +* Wed May 27 2014 Sandro Mani - 2.4.0-10 +- Rebuild with docs enabled +- Update python-pillow_openjpeg-2.1.0.patch + * Tue May 27 2014 Sandro Mani - 2.4.0-9 - Rebuild against openjpeg-2.1.0 diff --git a/python-pillow_openjpeg-2.1.0.patch b/python-pillow_openjpeg-2.1.0.patch index 8e11a85..66e8e4d 100644 --- a/python-pillow_openjpeg-2.1.0.patch +++ b/python-pillow_openjpeg-2.1.0.patch @@ -102,9 +102,9 @@ diff -rupN python-imaging-Pillow-72de37c/PIL/Jpeg2KImagePlugin.py python-imaging + elif hasattr(self.fp, "seek"): + try: + pos = f.tell() -+ seek(0, 2) ++ f.seek(0, 2) + length = f.tell() -+ seek(pos, 0) ++ f.seek(pos, 0) + except: + length = -1 +