Accepting request 970638 from home:cboltz:branches:graphics

- drop ImageMagick-s390-disable-tests.patch - the tests no longer fail

OBS-URL: https://build.opensuse.org/request/show/970638
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=596

ImageMagick-s390-disable-tests.patch

@@ -1,79 +0,0 @@
-Index: ImageMagick-7.0.10-10/PerlMagick/t/montage.t
-===================================================================
---- ImageMagick-7.0.10-10.orig/PerlMagick/t/montage.t	2020-04-28 01:39:32.000000000 +0200
-+++ ImageMagick-7.0.10-10/PerlMagick/t/montage.t	2020-05-04 12:00:52.544321014 +0200
-@@ -15,7 +15,7 @@
- #
- # Test montage method.
- #
--BEGIN { $| = 1; $test=1, print "1..19\n"; }
-+BEGIN { $| = 1; $test=1, print "1..16\n"; }
- END {print "not ok 1\n" unless $loaded;}
- use Image::Magick;
- $loaded=1;
-@@ -113,41 +113,6 @@ testMontage( q//,
-   'ae4322daebfbd3fe448afffe33aa599be518eaebb3515793e1efe6dc33939383');
- 
- #
--# 11) Test Framed Montage
--#
--# Image border color 'bordercolor' controls frame background color
--# Image matte color 'mattecolor' controls frame color
--# Image pen color 'pen' controls label text foreground color
--++$test;
--testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
--  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10',
--  borderwidth=>'0', gravity=>'Center', background=>'gray'/,
--  '40835871b13232243ba4d2bcb244d06958556a24a9624e793f5c4c291d64f322',
--  '531d0d485d55a5b585cab3f64b37da81a109fbaa91aa44a038fa916421780f14',
--  '40835871b13232243ba4d2bcb244d06958556a24a9624e793f5c4c291d64f322');
--
--#
--# 12) Test Framed Montage with drop-shadows
--#
--++$test;
--testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
--  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
--  borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/,
--  'c11aad0132d57f84ec42aad600f2c9f3fdb9ad5a64235cb08a296c0f1a509f6d',
--  '51b8db221299cea2bea84b11247bfa4b41a0cc3a9af27ff4c20f9c23ee7f2117',
--  '7b8d2dbf3ee22440fd5df36090922bb599ab6b4df216282cc51bb4328d03a211');
--
--#
--# 13) Test Framed Montage with drop-shadows and background texture
--#
--++$test;
--testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
--  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
--  borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
--  '292b115e08fcef4888ee3f386c6c3aff1c0ed008e34697435c1e4116a75149ed',
--  'e2fe0b56decf6fd791813e99d7b0f40646a479589e7519d97e2f92969dd17a1e',
--  '2c6bc96010beb38d123cc712ded96ecbbef40265a80e9638e9ea9034d64227f3');
--
- #
- # 14) Test Un-bordered, Un-framed Montage
- #
-Index: ImageMagick-7.0.10-10/PerlMagick/t/read.t
-===================================================================
---- ImageMagick-7.0.10-10.orig/PerlMagick/t/read.t	2020-04-28 01:39:32.000000000 +0200
-+++ ImageMagick-7.0.10-10/PerlMagick/t/read.t	2020-05-04 11:45:34.455692428 +0200
-@@ -15,7 +15,7 @@
- #
- # Test reading formats supported directly by ImageMagick.
- #
--BEGIN { $| = 1; $test=1; print "1..47\n"; }
-+BEGIN { $| = 1; $test=1; print "1..46\n"; }
- END {print "not ok $test\n" unless $loaded;}
- use Image::Magick;
- $loaded=1;
-@@ -72,10 +72,6 @@ print("MAT (MatLab gray 8-bit MSB intege
- ++$test;
- testReadCompare('input_gray_msb_08bit.mat', 'reference/read/input_gray_msb_08bit_mat.miff', q//, 0.22, 1.022);
- 
--print("MAT (MatLab gray 64-bit LSB double) ...\n");
--++$test;
--testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.022);
--
- print("MAT (MatLab RGB 8-bit LSB integer) ...\n");
- ++$test;
- testReadCompare('input_rgb_lsb_08bit.mat', 'reference/read/input_rgb_lsb_08bit_mat.miff', q//, 0.0, 0.0);

ImageMagick.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr 17 12:36:12 UTC 2022 - Christian Boltz <suse-beta@cboltz.de>
+
+- drop ImageMagick-s390-disable-tests.patch - the tests no longer fail
+
 -------------------------------------------------------------------
 Thu Apr  7 07:29:22 UTC 2022 - pgajdos@suse.com
 

ImageMagick.spec

@@ -46,9 +46,6 @@ Source3:        ImageMagick.keyring
 # suse specific patches
 Patch0:         ImageMagick-configuration-SUSE.patch
 Patch2:         ImageMagick-library-installable-in-parallel.patch
-#%%ifarch s390x s390 ppc64 ppc
-Patch3:         ImageMagick-s390-disable-tests.patch
-#%%endif
 #%%ifarch i586
 #%%if %%{?suse_version} < 1550
 # do not report test issues related to 32-bit architectures upstream,
@@ -340,9 +337,6 @@ preserved.
 %prep
 %setup -q -n ImageMagick-%{source_version}
 %patch2 -p1
-%ifarch s390x s390 ppc ppc64
-%patch3 -p1
-%endif
 %ifarch i586
 %if %{?suse_version} < 1550
 %patch4 -p1