Update openjpeg-2.1.0 patch, re-enable docs

This commit is contained in:
Sandro Mani 2014-05-28 00:18:45 +02:00
parent db39066684
commit bdb781997f
2 changed files with 8 additions and 4 deletions

View File

@ -6,7 +6,7 @@
%global name3 python3-pillow %global name3 python3-pillow
# bootstrap building docs (pillow is required by docutils, docutils are # bootstrap building docs (pillow is required by docutils, docutils are
# required by sphinx; pillow build-requires sphinx) # required by sphinx; pillow build-requires sphinx)
%global with_docs 0 %global with_docs 1
# RHEL-7 doesn't have python 3 # RHEL-7 doesn't have python 3
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
@ -28,7 +28,7 @@
Name: python-pillow Name: python-pillow
Version: 2.4.0 Version: 2.4.0
Release: 9%{?snap}%{?dist} Release: 10%{?snap}%{?dist}
Summary: Python image processing library Summary: Python image processing library
# License: see http://www.pythonware.com/products/pil/license.htm # License: see http://www.pythonware.com/products/pil/license.htm
@ -388,6 +388,10 @@ popd
%endif %endif
%changelog %changelog
* Wed May 27 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-10
- Rebuild with docs enabled
- Update python-pillow_openjpeg-2.1.0.patch
* Tue May 27 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-9 * Tue May 27 2014 Sandro Mani <manisandro@gmail.com> - 2.4.0-9
- Rebuild against openjpeg-2.1.0 - Rebuild against openjpeg-2.1.0

View File

@ -102,9 +102,9 @@ diff -rupN python-imaging-Pillow-72de37c/PIL/Jpeg2KImagePlugin.py python-imaging
+ elif hasattr(self.fp, "seek"): + elif hasattr(self.fp, "seek"):
+ try: + try:
+ pos = f.tell() + pos = f.tell()
+ seek(0, 2) + f.seek(0, 2)
+ length = f.tell() + length = f.tell()
+ seek(pos, 0) + f.seek(pos, 0)
+ except: + except:
+ length = -1 + length = -1
+ +