Accepting request 560071 from graphics

- readd ImageMagick-relax-filter.t.patch for SLE15 i586
- enable ImageMagick-s390-disable-tests.patch also for s390, in
  addition to s390x

OBS-URL: https://build.opensuse.org/request/show/560071
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=151

ImageMagick-relax-filter.t.patch

@@ -0,0 +1,21 @@
+diff -urN ImageMagick-7.0.6-0.orig/PerlMagick/t/filter.t ImageMagick-7.0.6-0/PerlMagick/t/filter.t
+--- ImageMagick-7.0.6-0.orig/PerlMagick/t/filter.t	2017-06-11 13:39:49.000000000 +0200
++++ ImageMagick-7.0.6-0/PerlMagick/t/filter.t	2017-08-10 02:24:02.823623000 +0200
+@@ -57,7 +57,7 @@
+ testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Colorize.miff', 'Colorize', q/fill=>"red", blend=>"50%"/, 0.0, 0.0 );
+ ++$test;
+ 
+-testFilterCompare('input.miff',  q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.0, 0.0);
++testFilterCompare('input.miff',  q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.001, 0.4);
+ ++$test;
+ 
+ testFilterCompare('input.miff',  q//, 'reference/filter/Convolve.miff', 'Convolve', q/[0.0625, 0.0625, 0.0625, 0.0625, 0.5, 0.0625, 0.0625, 0.0625, 0.0625]/, 0.1, 0.7);
+@@ -138,7 +138,7 @@
+ testFilterCompare('input.miff',  q//, 'reference/filter/OilPaint.miff', 'OilPaint', q//, 0.03, 1.0);
+ ++$test;
+ 
+-testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Opaque.miff', 'Opaque', q/color=>"#e23834", fill=>"green"/, 0.0, 0.0);
++testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Opaque.miff', 'Opaque', q/color=>"#e23834", fill=>"green"/, 0.05, 0.5);
+ ++$test;
+ 
+ testFilterCompare('input.miff',  q//, 'reference/filter/Quantize.miff', 'Quantize', q//, 0.2, 0.7);

ImageMagick.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 27 08:31:38 UTC 2017 - pgajdos@suse.com
+
+- readd ImageMagick-relax-filter.t.patch for SLE15 i586
+- enable ImageMagick-s390-disable-tests.patch also for s390, in
+  addition to s390x
+
 -------------------------------------------------------------------
 Mon Dec 18 08:32:18 UTC 2017 - pgajdos@suse.com
 

ImageMagick.spec

@@ -38,6 +38,12 @@ Source2:        http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%
 Source3:        ImageMagick.keyring
 # suse specific patches
 Patch0:         ImageMagick-disable-insecure-coders.patch
+# workaround, see https://github.com/ImageMagick/ImageMagick/issues/439
+#%%ifarch i586
+#%%if %{?suse_version} == 1500
+Patch1:         ImageMagick-relax-filter.t.patch
+#%%endif
+#%%endif
 Patch2:         ImageMagick-library-installable-in-parallel.patch
 #%%ifarch s390x
 Patch3:         ImageMagick-s390-disable-tests.patch
@@ -275,8 +281,13 @@ HTML documentation for ImageMagick library and scene examples.
 %prep
 %setup -q -n ImageMagick-%{source_version}
 %patch0 -p1
+%ifarch i586
+%if %{?suse_version} == 1500
+%patch1 -p1
+%endif
+%endif
 %patch2 -p1
-%ifarch s390x
+%ifarch s390x s390
 %patch3 -p1
 %endif