diff --git a/ImageMagick-6.8.4-0.tar.bz2 b/ImageMagick-6.8.4-0.tar.bz2 deleted file mode 100644 index d55e226..0000000 --- a/ImageMagick-6.8.4-0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:448e75a4438433a42030fe6419927dd2397a9cd3ad820bde7c6fe3202696edfc -size 11047135 diff --git a/ImageMagick-6.8.4.0-fix-wand.pc.patch b/ImageMagick-6.8.4.0-fix-wand.pc.patch deleted file mode 100644 index 8cd59cb..0000000 --- a/ImageMagick-6.8.4.0-fix-wand.pc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: ImageMagick-6.8.4-0/wand/Wand.pc.in -=================================================================== ---- ImageMagick-6.8.4-0.orig/wand/Wand.pc.in -+++ ImageMagick-6.8.4-0/wand/Wand.pc.in -@@ -2,10 +2,10 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ --libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -+libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ - - Name: MagickWand --Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) -+Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) - Version: @PACKAGE_VERSION@ - Requires: MagickCore - Libs: -L${libdir} -l${libname} diff --git a/ImageMagick-6.8.4.0-test-signatures.patch b/ImageMagick-6.8.4.0-test-signatures.patch deleted file mode 100644 index f2f5487..0000000 --- a/ImageMagick-6.8.4.0-test-signatures.patch +++ /dev/null @@ -1,47 +0,0 @@ -I get the same signatures for quantum depth 8 as in -http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.5.8/PerlMagick/t/montage.t -http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.5.8/PerlMagick/t/write.t -in these four tests. For quantum depth 16, the signatures are correct. -Index: ImageMagick-6.8.4-0/PerlMagick/t/montage.t -=================================================================== ---- ImageMagick-6.8.4-0.orig/PerlMagick/t/montage.t -+++ ImageMagick-6.8.4-0/PerlMagick/t/montage.t -@@ -153,7 +153,7 @@ testMontage( q/bordercolor=>'blue', matt - 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'/, -- '61645a8c80a7220a4260133a2b1ae720bf2755f2ed880a3fef0e9453641f5b79', -+ 'd4de864f9004b185297c9c2351f811aaeb779095bdd8fd5f29bcfbee79f09da4', - 'bcd96dabb454c5d25091422763b1cdecb6a69a9b02b84a5b7fa0a70f150b957c', - '079a08058fa670d60be858828a42732a2a6e1a4c34f2d179661b0fb71f719219'); - -@@ -164,7 +164,7 @@ testMontage( q/bordercolor=>'blue', matt - 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:'/, -- '4655b59218afbd58d24a9ecf162a42868b3de40ecc8e9f9671dccf8b17e1aa33', -+ '8418407b6d56d2c1b67bc735004794d9eb20609d30115a93255eefcad3499e95', - '9209b2db884fa4730eeab6c410b90e094fa305635baab7ede17270c13f6e80ad', - '877a7277907a804286062823461c37690edaaa5d0bc7b813989bcaa0d4ebeaaf'); - -Index: ImageMagick-6.8.4-0/PerlMagick/t/write.t -=================================================================== ---- ImageMagick-6.8.4-0.orig/PerlMagick/t/write.t -+++ ImageMagick-6.8.4-0/PerlMagick/t/write.t -@@ -72,14 +72,14 @@ print("CompuServe graphics interchange f - testReadWrite( 'GIF:input.gif', - 'GIF:output.gif', - q//, -- '0c2e3c82fd375360fba16258bfa83e35b8c878fd208da9818b50e423426cc437'); -+ '5a25065144213cd0230b7572bd9aef0e447c23a0622193a94ae62c9895c44bf7'); - - print("CompuServe graphics interchange format (1987) ...\n"); - ++$test; - testReadWrite( 'GIF87:input.gif87', - 'GIF87:output.gif87', - q//, -- 'b68fe02737630f219fbf1f9ef3f24cf2b73c21848443a02df2cc2c0212a65657'); -+ '0138e1e5c9a7ed1604ec5bbe8c22378b84fcd9abb8c36e984b051f9efc14d54e'); - - print("Magick image file format ...\n"); - ++$test; diff --git a/ImageMagick-6.8.5-6.tar.bz2 b/ImageMagick-6.8.5-6.tar.bz2 new file mode 100644 index 0000000..84aa748 --- /dev/null +++ b/ImageMagick-6.8.5-6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29158d19ea0dadf10b314c859b167a654922fa2701ded572fa9983ad603876a3 +size 11041079 diff --git a/ImageMagick.changes b/ImageMagick.changes index d38c10a..6d774ea 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon May 13 09:01:39 UTC 2013 - pgajdos@suse.com + +- update to 6.8.5-6: + * fixed 'Sometimes an sRGB image is masquerading as grayscale' + * fixed 'The stream utility no longer faults when exporting float pixels' + * Labels no longer overflow + * Change the sample JPEG quantization table xml to something that works + really well with 2x2 Chroma subsampling around quality 75. + * Eliminate whitespace from image properties that hold PNG chunk data. + * etc. see ChangeLog +- remove fix-wand.pc.patch, the issue is fixed upstream +- remove test-signatures.patch, the issue is fixed upstream + ------------------------------------------------------------------- Sun Apr 7 12:00:44 UTC 2013 - coolo@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 62ca7ad..c5aef23 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -42,8 +42,8 @@ BuildRequires: lzma-devel BuildRequires: pango-devel BuildRequires: pkgconfig -%define mfr_version 6.8.4 -%define mfr_revision 0 +%define mfr_version 6.8.5 +%define mfr_revision 6 %define quantum_depth 8 %define source_version %{mfr_version}-%{mfr_revision} %define libver 1 @@ -64,12 +64,8 @@ Patch1: ImageMagick-6.6.8.9-doc.patch Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch Patch3: ImageMagick-6.8.4.0-rpath.patch # bugs -# http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=22479 comment from 2013-03-29 -Patch10: ImageMagick-6.8.4.0-test-signatures.patch # will ask upstream if needed, or if other solution exists Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch -# PATCH-FIX-UPSTREAM ImageMagick-6.8.4.0-fix-wand.pc.patch fix e.g. emacs build, pkg-config --libs Wand returns wrong lib -Patch12: ImageMagick-6.8.4.0-fix-wand.pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick @@ -131,9 +127,7 @@ BuildArch: noarch %patch1 %patch2 -p1 %patch3 -p1 -%patch10 -p1 %patch11 -p1 -%patch12 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -208,7 +202,6 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name} %docdir %{_docdir}/%{name} %doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %{_bindir}/[^MW]* -%{_libdir}/ImageMagick*/bin* %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz @@ -393,4 +386,9 @@ support multiple generations of an image in memory at one time. HTML documentation for ImageMagick library and scene examples. + + + + + %changelog