- New version 6.6.2-1 (BZ#579458, BZ#565940 -

http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16320)
- Replace %%define by %%global

.cvsignore

@@ -1,2 +1,2 @@
+ImageMagick-6.6.2-1.tar.xz
 ImageMagick-6.4.0-multilib.patch
-ImageMagick-6.6.0-2.tar.xz

ImageMagick-6.4.0-xdg-open.patch

@@ -1,48 +0,0 @@
-diff -up ImageMagick-6.4.0/configure.ac.orig ImageMagick-6.4.0/configure.ac
---- ImageMagick-6.4.0/configure.ac.orig	2008-04-22 05:38:56.000000000 +0200
-+++ ImageMagick-6.4.0/configure.ac	2008-04-27 16:33:28.000000000 +0200
-@@ -2391,7 +2391,7 @@ AC_MSG_RESULT([-------------------------
- AutotraceDecodeDelegateDefault='autotrace'
- AVIDecodeDelegateDefault='mplayer'
- BZIPDelegateDefault='bzip2'
--BrowseDelegateDefault='htmlview'
-+BrowseDelegateDefault='xdg-open'
- CGMDecodeDelegateDefault='ralcgm'
- CatDelegateDefault='cat'
- DNGDecodeDelegateDefault='ufraw-batch'
-diff -up ImageMagick-6.4.0/magick/delegate.c.orig ImageMagick-6.4.0/magick/delegate.c
---- ImageMagick-6.4.0/magick/delegate.c.orig	2008-04-06 03:39:42.000000000 +0200
-+++ ImageMagick-6.4.0/magick/delegate.c	2008-04-27 16:35:46.000000000 +0200
-@@ -78,7 +78,7 @@ static const char
-     "<delegatemap>"
-     "  <delegate decode=\"autotrace\" stealth=\"True\" command=\"&quot;autotrace&quot; -output-format svg -output-file &quot;%o&quot; &quot;%i&quot;\"/>"
-     "  <delegate decode=\"avi:decode\" stealth=\"True\" command=\"&quot;mplayer&quot; &quot;%i&quot; -really-quiet -ao null -vo png:z=3\"/>"
--    "  <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\"&quot;htmlview&quot; http://www.imagemagick.org/\"/>"
-+    "  <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\"&quot;xdg-open&quot; http://www.imagemagick.org/\"/>"
-     "  <delegate decode=\"cgm\" thread-support=\"False\" command=\"&quot;ralcgm&quot; -d ps -oC &lt; &quot;%i&quot; &gt; &quot;%o&quot; &gt;&gt;/dev/null\"/>"
-     "  <delegate decode=\"dng:decode\" command=\"&quot;/usr/bin/ufraw-batch&quot; --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 &quot;--output=%u.pnm&quot; &quot;%i&quot;\"/>"
-     "  <delegate decode=\"edit\" stealth=\"True\" command=\"&quot;xterm&quot; -title &quot;Edit Image Comment&quot; -e vi &quot;%o&quot;\"/>"
-diff -up ImageMagick-6.4.0/www/source/delegates.xml.orig ImageMagick-6.4.0/www/source/delegates.xml
---- ImageMagick-6.4.0/www/source/delegates.xml.orig	2008-04-04 18:43:27.000000000 +0200
-+++ ImageMagick-6.4.0/www/source/delegates.xml	2008-04-27 16:35:06.000000000 +0200
-@@ -57,7 +57,7 @@
- -->
- <delegatemap>
-   <delegate decode="autotrace" stealth="True" command="&quot;autotrace&quot; -output-format svg -output-file &quot;%o&quot; &quot;%i&quot;"/>
--  <delegate decode="browse" stealth="True" spawn="True" command="&quot;htmlview&quot; http://www.imagemagick.org/"/>
-+  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/"/>
-   <delegate decode="cgm" thread-support="False" command="&quot;ralcgm&quot; -d ps -oC &lt; &quot;%i&quot; &gt; &quot;%o&quot; 2&gt; &quot;%u&quot;"/>
-   <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 &quot;--output=%u.pnm&quot; &quot;%i&quot;"/>
-   <delegate decode="edit" stealth="True" command="&quot;xterm&quot; -title &quot;Edit Image Comment&quot; -e vi &quot;%o&quot;"/>
-diff -up ImageMagick-6.4.0/configure.orig ImageMagick-6.4.0/configure
---- ImageMagick-6.4.0/configure.orig	2008-04-24 17:07:05.000000000 +0200
-+++ ImageMagick-6.4.0/configure	2008-04-27 16:33:28.000000000 +0200
-@@ -40762,7 +40762,7 @@ $as_echo "------------------------------
- AutotraceDecodeDelegateDefault='autotrace'
- AVIDecodeDelegateDefault='mplayer'
- BZIPDelegateDefault='bzip2'
--BrowseDelegateDefault='htmlview'
-+BrowseDelegateDefault='xdg-open'
- CGMDecodeDelegateDefault='ralcgm'
- CatDelegateDefault='cat'
- DNGDecodeDelegateDefault='ufraw-batch'

ImageMagick-6.4.9-6-perl-build.patch

@@ -1,12 +0,0 @@
-diff -up ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in~ ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in
---- ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in~	2009-01-03 16:55:31.000000000 +0100
-+++ ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in	2009-03-13 11:22:46.000000000 +0100
-@@ -77,7 +77,7 @@ WriteMakefile
-    'INSTALLBIN'	=> '@BIN_DIR@',
- 
-    # Library specification
--   'LIBS'	=> [ '-L@MAGICKCORE_PATH@ -L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
-+   'LIBS'	=> [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
- 
-    # Perl binary name (if a Perl binary is built)
-    'MAP_TARGET'	=> 'PerlMagick',

ImageMagick-6.4.9-6-undef-warning.patch

@@ -1,12 +0,0 @@
-diff -up ImageMagick-6.4.9-6/magick/magick-type.h~ ImageMagick-6.4.9-6/magick/magick-type.h
---- ImageMagick-6.4.9-6/magick/magick-type.h~	2009-01-15 03:13:58.000000000 +0100
-+++ ImageMagick-6.4.9-6/magick/magick-type.h	2009-03-13 10:30:59.000000000 +0100
-@@ -127,7 +127,7 @@ typedef unsigned __int64 MagickSizeType;
- #define MagickSizeFormat  "%10llu"
- #endif
- 
--#if _MSC_VER == 1200
-+#if defined(_MSC_VER) && (_MSC_VER == 1200)
- typedef MagickOffsetType QuantumAny;
- #else
- typedef MagickSizeType QuantumAny;

ImageMagick.spec

@@ -1,9 +1,9 @@
-%define VER 6.6.0
+%global VER 6.6.2
-%define Patchlevel 2
+%global Patchlevel 1
 
 Name:           ImageMagick
 Version:        %{VER}.%{Patchlevel}
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An X application for displaying and manipulating images
 Group:          Applications/Multimedia
 License:        ImageMagick
@@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 cp -a www/source $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{VER}
+# Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!!
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # fix weird perl Magick.so permissions
@@ -303,6 +304,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 1 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 6.6.2.1-10
+- New version 6.6.2-1 (BZ#579458, BZ#565940 - http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16320)
+- Replace %%define by %%global
+
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 6.6.0.2-9
 - Mass rebuild with perl-5.12.0
 
@@ -318,7 +323,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 30 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 6.5.4.7-4
 - Explude file Generic.ttf from -perl subpackage demos. Demos perfectly work without it, but with bundled font
-	package does not pass QA (Unfortunately no bugreport there, only mail from Nicolas Mailhot)
+  package does not pass QA (Unfortunately no bugreport there, only mail from Nicolas Mailhot)
 
 * Mon Aug 3 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 6.5.4.7-3
 - Update to version 6.5.4-7

sources

@@ -1,2 +1,2 @@
+c910c63df80572366b488e3302f7cbb8  ImageMagick-6.6.2-1.tar.xz
 0b9908beeeaf4e7990b23c80e6e81d14  ImageMagick-6.4.0-multilib.patch
-812a71c5ee2a3b49eb1f1a170634961d  ImageMagick-6.6.0-2.tar.xz