[ImageMagick] - Update to 6.8.5-10 upstream version (bz#720285).

[Pavel Alexeev]

commit a619cc2b186c4397d3dd634a8b7b9ac976e52ec0
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Wed Jun 12 15:08:38 2013 +0400

    - Update to 6.8.5-10 upstream version (bz#720285).
    
    - By Remi Collet request (bz#969760) enable those features in ImageMagick:
    	--with-lcms2 (instead of --with-lcms): lcms2-devel
    	--with-openexr: OpenEXR-devel
    	--with-webp: libwebp-devel

 ImageMagick-6.4.0-multilib.patch |  191 --------------------------------------
 ImageMagick.spec                 |   38 +++++---
 2 files changed, 22 insertions(+), 207 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 30325db..2298cd8 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,9 +1,9 @@
-%global VER 6.8.3
-%global Patchlevel 9
+%global VER 6.8.5
+%global Patchlevel 10
 
 Name:		ImageMagick
 Version:		%{VER}.%{Patchlevel}
-Release:		2%{?dist}
+Release:		1%{?dist}
 Summary:		An X application for displaying and manipulating images
 Group:		Applications/Multimedia
 License:		ImageMagick
@@ -18,8 +18,8 @@ BuildRequires:	libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1
 BuildRequires:	ghostscript-devel, djvulibre-devel
 BuildRequires:	libwmf-devel, jasper-devel, libtool-ltdl-devel
 BuildRequires:	libX11-devel, libXext-devel, libXt-devel
-BuildRequires:	lcms-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel
-BuildRequires:	fftw-devel
+BuildRequires:	lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel
+BuildRequires:	fftw-devel, OpenEXR-devel, libwebp-devel
 
 %description
 ImageMagick is an image display and manipulation tool for the X
@@ -41,15 +41,9 @@ ImageMagick-devel as well.
 Summary:	Library links and header files for ImageMagick app development
 Group:	Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libX11-devel, libXext-devel, libXt-devel
-Requires:	ghostscript-devel
-Requires:	bzip2-devel
-Requires:	freetype-devel
-Requires:	libtiff-devel
-Requires:	libjpeg-devel
-Requires:	lcms-devel
-Requires:	jasper-devel
-Requires:	pkgconfig
+Requires:	libX11-devel, libXext-devel, libXt-devel, ghostscript-devel
+Requires:	bzip2-devel, freetype-devel, libtiff-devel, libjpeg-devel, lcms2-devel
+Requires:	libwebp-devel, OpenEXR-devel, jasper-devel, pkgconfig
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
@@ -157,7 +151,9 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
            --with-magick_plus_plus \
            --with-gslib \
            --with-wmf \
-           --with-lcms \
+           --with-lcms2 \
+           --with-webp \
+           --with-openexr \
            --with-rsvg \
            --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
@@ -323,10 +319,16 @@ rm -rf %{buildroot}
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Wed Jun 12 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 6.5.5.10-1
+- Update to 6.8.5-10 upstream version (bz#720285).
+- By Remi Collet request (bz#969760) enable those features in ImageMagick:
+	--with-lcms2 (instead of --with-lcms): lcms2-devel
+	--with-openexr: OpenEXR-devel
+	--with-webp: libwebp-devel
+
 * Thu Apr 18 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.3.9-2
 - Enable fftw to do Fourier transforms (add BuildRequires: fftw-devel) - bz#950254 by Søren Sandmann Pedersen request.
 
-
 * Sun Mar 10 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.3.9-1
 - Update to 6.8.3-9 (so-naming scheme change to *-6.so) (ml: http://www.mail-archive.com/devel@lists.fedoraproject.org/msg57163.html).
 - Split out libs subpackage by Remi Collet request (bz#849065).
@@ -503,6 +505,10 @@ rm -rf %{buildroot}
 
 * Sun Jul 27 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 6.4.0.10-2
 - Fix ownership of /usr/include/ImageMagick (bz 444647)
+- By Remi request (bz#969760) enable those features in ImageMagick:
+	--with-lcms2 (instead of --with-lcms): lcms2-devel
+	--with-openexr: OpenEXR-devel
+	--with-webp: libwebp-devel
 
 * Sat Apr 26 2008 Hans de Goede <jwrdegoede at fedoraproject.org> 6.4.0.10-1
 - New upstream release 6.4.0.10