Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2014-02-15 17:16:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ImageMagick" Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2014-01-10 21:19:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2014-02-15 17:16:45.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 13 14:03:12 UTC 2014 - pgaj...@suse.com + +- modified patches [bnc#843673]: + * disable_mat_test.patch -- rather than disable the test, + use upstream solution (increase threshold for mean error) + -- use this patch also for s390, s390x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.gYkdkw/_old 2014-02-15 17:16:45.000000000 +0100 +++ /var/tmp/diff_new_pack.gYkdkw/_new 2014-02-15 17:16:45.000000000 +0100 @@ -76,6 +76,7 @@ # bugs # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch +# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=24957 Patch12: disable_mat_test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -141,8 +142,8 @@ %patch3 -p1 %patch4 -p1 %patch11 -p1 -%ifarch ppc ppc64 -%patch12 -p1 +%ifarch ppc ppc64 s390 s390x +%patch12 %endif %build @@ -397,6 +398,7 @@ + ++++++ disable_mat_test.patch ++++++ --- /var/tmp/diff_new_pack.gYkdkw/_old 2014-02-15 17:16:45.000000000 +0100 +++ /var/tmp/diff_new_pack.gYkdkw/_new 2014-02-15 17:16:45.000000000 +0100 @@ -1,24 +1,13 @@ -Index: ImageMagick-6.8.6-9/PerlMagick/t/read.t +Index: PerlMagick/t/read.t =================================================================== ---- ImageMagick-6.8.6-9.orig/PerlMagick/t/read.t -+++ ImageMagick-6.8.6-9/PerlMagick/t/read.t -@@ -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.2, 1.02); +--- PerlMagick/t/read.t.orig 2013-11-18 14:03:16.000000000 +0100 ++++ PerlMagick/t/read.t 2014-02-13 15:03:03.017996724 +0100 +@@ -74,7 +74,7 @@ --print("MAT (MatLab gray 64-bit LSB double) ...\n"); --++$test; + 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.2, 1.02); -- ++testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.02); + 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.2, 1.02); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
