[python-pillow] Update to 2.3.0
Sandro Mani
smani at fedoraproject.org
Fri Jan 3 00:24:39 UTC 2014
commit 4a6eafbd7768b56d63dbf14cf40cd3fcf432728c
Author: Sandro Mani <manisandro at gmail.com>
Date: Fri Jan 3 01:24:29 2014 +0100
Update to 2.3.0
python-pillow.spec | 18 ++++++++++++------
python-pillow_test-webp.patch | 12 ++++++++++++
2 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/python-pillow.spec b/python-pillow.spec
index 7a57945..641c4ba 100644
--- a/python-pillow.spec
+++ b/python-pillow.spec
@@ -39,12 +39,14 @@ Source0: https://github.com/python-imaging/Pillow/tarball/%{commit}/pytho
# Add s390* and ppc* archs
Patch0: python-pillow-archs.patch
+# Fix overly-strict test
+Patch1: python-pillow_test-webp.patch
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: tkinter
BuildRequires: tk-devel
-BuildRequires: python-sphinx
+# BuildRequires: python-sphinx
BuildRequires: libjpeg-devel
BuildRequires: zlib-devel
BuildRequires: freetype-devel
@@ -63,7 +65,7 @@ BuildRequires: python3-setuptools
BuildRequires: python3-tkinter
BuildRequires: python3-PyQt4
BuildRequires: python3-numpy
-BuildRequires: python3-sphinx
+# BuildRequires: python3-sphinx
%endif
Provides: python-imaging = %{version}-%{release}
@@ -206,6 +208,7 @@ PIL image wrapper for Qt.
%prep
%setup -q -n python-imaging-Pillow-%{shortcommit}
%patch0 -p1 -b .archs
+%patch1 -p1
%if %{with_python3}
# Create Python 3 source tree
@@ -224,7 +227,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
popd
pushd docs
-PYTHONPATH=$PWD/../build/%py2_libbuilddir make html
+# PYTHONPATH=$PWD/../build/%%py2_libbuilddir make html
rm -f _build/html/.buildinfo
popd
@@ -239,7 +242,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
popd
pushd docs
-PYTHONPATH=$PWD/../build/%py3_libbuilddir make html SPHINXBUILD=sphinx-build-%python3_version
+# PYTHONPATH=$PWD/../build/%%py3_libbuilddir make html SPHINXBUILD=sphinx-build-%%python3_version
rm -f _build/html/.buildinfo
popd
popd
@@ -311,7 +314,8 @@ popd
%{py2_incdir}/Imaging/
%files doc
-%doc Scripts Images docs/_build/html
+%doc Scripts Images
+# docs/_build/html
%files sane
%doc Sane/CHANGES Sane/demo*.py Sane/sanedoc.txt
@@ -340,7 +344,8 @@ popd
%{py3_incdir}/Imaging/
%files -n %{name3}-doc
-%doc Scripts Images docs/_build/html
+%doc Scripts Images
+# docs/_build/html
%files -n %{name3}-sane
%doc Sane/CHANGES Sane/demo*.py Sane/sanedoc.txt
@@ -359,6 +364,7 @@ popd
%changelog
* Thu Jan 02 2014 Sandro Mani <manisandro at gmail.com> - 2.3.0-1
- Update to 2.3.0
+- Build with doc disabled to break circular python-pillow -> python-sphinx -> python pillow dependency
* Wed Oct 23 2013 Sandro Mani <manisandro at gmail.com> - 2.2.1-2
- Backport fix for decoding tiffs with correct byteorder, fixes rhbz#1019656
diff --git a/python-pillow_test-webp.patch b/python-pillow_test-webp.patch
new file mode 100644
index 0000000..54e0846
--- /dev/null
+++ b/python-pillow_test-webp.patch
@@ -0,0 +1,12 @@
+diff -rupN python-imaging-Pillow-b1b88cf/Tests/test_file_webp.py python-imaging-Pillow-b1b88cf-new/Tests/test_file_webp.py
+--- python-imaging-Pillow-b1b88cf/Tests/test_file_webp.py 2014-01-01 22:10:13.000000000 +0100
++++ python-imaging-Pillow-b1b88cf-new/Tests/test_file_webp.py 2014-01-03 01:14:58.873000325 +0100
+@@ -28,7 +28,7 @@ def test_read_rgb():
+
+ # generated with: dwebp -ppm ../../Images/lena.webp -o lena_webp_bits.ppm
+ target = Image.open('Tests/images/lena_webp_bits.ppm')
+- assert_image_equal(image, target)
++ assert_image_similar(image, target, 20.0)
+
+
+ def test_write_rgb():
More information about the scm-commits
mailing list