From 6840c482a4c87e2edf84dabf59674e2ae87bd439aa38dc2d0f2737597f4c7a5e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 2 Oct 2013 12:42:32 +0000 Subject: [PATCH 1/3] Accepting request 201884 from home:k0da:ppc - disable mat tests for powerpc bnc#843673 (disable_mat_test.patch) please forward to Factory and openSUSE 13.1 OBS-URL: https://build.opensuse.org/request/show/201884 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=167 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 5 +++++ disable_mat_test.patch | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 disable_mat_test.patch diff --git a/ImageMagick.changes b/ImageMagick.changes index 3ac88f8..bec7c25 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 2 12:33:43 UTC 2013 - dvaleev@suse.com + +- disable mat tests for powerpc bnc#843673 (disable_mat_test.patch) + ------------------------------------------------------------------- Mon Sep 30 13:38:14 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index a043111..aef51fb 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -75,6 +75,7 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch # bugs # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch +Patch12: disable_mat_test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -139,6 +140,9 @@ BuildArch: noarch %patch3 -p1 %patch4 -p1 %patch11 -p1 +%ifarch ppc ppc64 +%patch12 -p1 +%endif %build export CFLAGS="$RPM_OPT_FLAGS" @@ -418,6 +422,7 @@ HTML documentation for ImageMagick library and scene examples. + %changelog diff --git a/disable_mat_test.patch b/disable_mat_test.patch new file mode 100644 index 0000000..dc84757 --- /dev/null +++ b/disable_mat_test.patch @@ -0,0 +1,24 @@ +Index: ImageMagick-6.8.6-9/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); + +-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); +- + 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); From 19631d6835ccfb091ad09a1124a93d73e97524fe7a27f62839b4c1eb8af42b93 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 2 Oct 2013 13:27:18 +0000 Subject: [PATCH 2/3] Accepting request 201893 from home:pgajdos - documentation back to -doc package OBS-URL: https://build.opensuse.org/request/show/201893 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=168 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 25 ++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index bec7c25..411e749 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -3,6 +3,11 @@ Wed Oct 2 12:33:43 UTC 2013 - dvaleev@suse.com - disable mat tests for powerpc bnc#843673 (disable_mat_test.patch) +------------------------------------------------------------------- +Wed Oct 2 08:32:02 UTC 2013 - pgajdos@suse.com + +- documentation back to -doc package + ------------------------------------------------------------------- Mon Sep 30 13:38:14 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index aef51fb..b61c504 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -179,26 +179,22 @@ cd PerlMagick make test %install -%{__install} -d "${RPM_BUILD_ROOT%}"'%{_defaultdocdir}/%{name}/images' %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - pkgdocdir=%{_defaultdocdir}/%{name}/ + DESTDIR=%{buildroot} \ + pkgdocdir=%{_defaultdocdir}/%{name}-doc/ %perl_process_packlist cd 'Magick++' %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' %{__mv} demo/makefile.2 demo/Makefile cd .. -%{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml -PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \ +%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml +PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' -%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* -%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la +%{__rm} %{buildroot}%{_libdir}/*.la %if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}*/wand -%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}*/www/api +%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-doc/www/api %endif -rm -rf %{buildroot}/%{_datadir}/doc/%{name} %post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig @@ -214,9 +210,8 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name} %files %defattr(-,root,root) -%docdir %{_docdir}/%{name} -%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %{_bindir}/[^MW]* +%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz @@ -301,7 +296,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name} %files doc %defattr(-,root,root) -%dir %{_docdir}/%{name} +%{_docdir}/%{name}-doc %description ImageMagick is a robust collection of tools and libraries to read, @@ -420,6 +415,10 @@ HTML documentation for ImageMagick library and scene examples. + + + + From 257f5001623f30bca2f94c74338254265f83e2a3032937361fe32ce0bde72e1b Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 3 Oct 2013 01:29:43 +0000 Subject: [PATCH 3/3] Accepting request 201922 from home:coolo:branches:openSUSE:Factory - documentation back to -doc package (bnc#841472) - fix baselibs.conf for previous change OBS-URL: https://build.opensuse.org/request/show/201922 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=169 --- ImageMagick.changes | 7 ++++++- ImageMagick.spec | 28 ---------------------------- baselibs.conf | 12 ++++++------ 3 files changed, 12 insertions(+), 35 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 411e749..c7fc44d 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -6,7 +6,12 @@ Wed Oct 2 12:33:43 UTC 2013 - dvaleev@suse.com ------------------------------------------------------------------- Wed Oct 2 08:32:02 UTC 2013 - pgajdos@suse.com -- documentation back to -doc package +- documentation back to -doc package (bnc#841472) + +------------------------------------------------------------------- +Tue Oct 1 15:58:38 UTC 2013 - coolo@suse.com + +- fix baselibs.conf for previous change ------------------------------------------------------------------- Mon Sep 30 13:38:14 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index b61c504..a39fc56 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -396,32 +396,4 @@ HTML documentation for ImageMagick library and scene examples. - - - - - - - - - - - - - - - - - - - - - - - - - - - - %changelog diff --git a/baselibs.conf b/baselibs.conf index d3a29f8..ac2ce4c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,11 +1,11 @@ -libMagickCore-6_Q8-1 -libMagickWand-6_Q8-1 -libMagick++-6_Q8-2 +libMagickCore-6_Q16-1 +libMagickWand-6_Q16-1 +libMagick++-6_Q16-2 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore-6_Q8-1- = " - requires "libMagickWand-6_Q8-1- = " + requires "libMagickCore-6_Q16-1- = " + requires "libMagickWand-6_Q16-1- = " libMagick++-devel requires -ImageMagick- - requires "libMagick++-6_Q8-2- = " + requires "libMagick++-6_Q16-2- = "