Accepting request 298326 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/298326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Pillow?expand=0&rev=13

fix-textsize-equal.patch

@@ -0,0 +1,13 @@
+Index: Pillow-2.7.0/Tests/test_imagefont.py
+===================================================================
+--- Pillow-2.7.0.orig/Tests/test_imagefont.py
++++ Pillow-2.7.0/Tests/test_imagefont.py
+@@ -108,7 +108,7 @@ try:
+ 
+             target = 'Tests/images/rectangle_surrounding_text.png'
+             target_img = Image.open(target)
+-            self.assert_image_equal(im, target_img)
++            self.assert_image_similar(im, target_img, .5)
+ 
+         def test_render_multiline(self):
+             im = Image.new(mode='RGB', size=(300, 100))

python-Pillow.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 21 14:13:51 UTC 2015 - tbechtold@suse.com
+
+- Add fix-textsize-equal.patch. Fixes testsuite on SLE11SP3
+
 -------------------------------------------------------------------
 Fri Feb  6 08:25:34 UTC 2015 - hpj@urpla.net
 
@@ -37,7 +42,6 @@ Thu Jan  8 10:55:04 UTC 2015 - tbechtold@suse.com
   - Fix potential PNG decompression DOS #1060
   - Fix Regression in PyPy 2.4 in streamio  #958
 
-
 -------------------------------------------------------------------
 Tue Nov 18 14:13:46 UTC 2014 - toddrme2178@gmail.com
 

python-Pillow.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-Pillow
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,8 @@ 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
-Patch:          Pillow-fixtests.patch
+Patch0:         Pillow-fixtests.patch
+Patch1:         fix-textsize-equal.patch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-tk
@@ -86,7 +87,8 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 
 %prep
 %setup -q -n Pillow-%{version}
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 python setup.py build