From 5bf0c828f8420391e85bf5f8ea66eb4a6ed031d03eea55d9edda8f60f949ff0b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 16 Mar 2018 13:31:03 +0000 Subject: [PATCH] - added ImageMagick-remove-test.tap-attributes.patch, removes failing test on i586 https://github.com/ImageMagick/ImageMagick/issues/1019 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=346 --- ImageMagick-remove-test.tap-attributes.patch | 22 ++++++++++++++++++++ ImageMagick.changes | 7 +++++++ ImageMagick.spec | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 ImageMagick-remove-test.tap-attributes.patch diff --git a/ImageMagick-remove-test.tap-attributes.patch b/ImageMagick-remove-test.tap-attributes.patch new file mode 100644 index 0000000..a634214 --- /dev/null +++ b/ImageMagick-remove-test.tap-attributes.patch @@ -0,0 +1,22 @@ +https://github.com/ImageMagick/ImageMagick/issues/1019 +Index: ImageMagick-7.0.7-26/Magick++/tests/tests.tap +=================================================================== +--- ImageMagick-7.0.7-26.orig/Magick++/tests/tests.tap 2018-03-11 22:49:04.000000000 +0100 ++++ ImageMagick-7.0.7-26/Magick++/tests/tests.tap 2018-03-16 14:21:59.572243993 +0100 +@@ -8,14 +8,14 @@ + # + subdir=Magick++/tests + . ./common.shi +-echo "1..13" ++echo "1..12" + + SRCDIR=${top_srcdir}/${subdir}/ + export SRCDIR + + cd ${subdir} || exit 1 + +-for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages ++for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages + do + ./${mytest} && echo "ok" || echo "not ok" + done diff --git a/ImageMagick.changes b/ImageMagick.changes index c974c6c..82d24e1 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 16 13:30:15 UTC 2018 - pgajdos@suse.com + +- added ImageMagick-remove-test.tap-attributes.patch, removes + failing test on i586 + https://github.com/ImageMagick/ImageMagick/issues/1019 + ------------------------------------------------------------------- Wed Mar 14 15:08:42 UTC 2018 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index fe372fb..47baf42 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,6 +48,7 @@ Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif +Patch4: ImageMagick-remove-test.tap-attributes.patch BuildRequires: chrpath BuildRequires: dcraw %if 0%{?suse_version} >= 1315 @@ -297,6 +298,7 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif +%patch4 -p1 %build # make library binary package parallel installable