--- cauldron/imagemagick/current/SPECS/imagemagick.spec	2012/06/02 03:19:50	253233
+++ updates/3/imagemagick/current/SPECS/imagemagick.spec	2014/11/14 00:17:18	796911
@@ -9,10 +9,10 @@
 # V E R S I O N   P A R T S
 
 # their "official" version
-%define rversion 6.7.7
+%define rversion 6.8.1
 
 # their "minor" version
-%define minor_rev 5
+%define minor_rev 1
 
 # some other funny version
 # (aw) from the docs: Versions with Q8 in the name are 8 bits-per-pixel
@@ -25,7 +25,7 @@
 # the full file version
 %define dversion %{rversion}-%{minor_rev}
 
-%define major 5
+%define major 7
 
 %define libname %mklibname magick %{major}
 %define develname %mklibname magick -d
@@ -33,11 +33,12 @@
 Summary:	An X application for displaying and manipulating images
 Name:		imagemagick
 Version:	%{rversion}.%{minor_rev}
-Release:	%mkrel 1
+%define subrel	2
+Release:	%mkrel 2
 License:	BSD-like
-Group:		Graphics
+Group:		Graphics/Editors and Converters
 URL:		http://www.imagemagick.org/
-Source0:	ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{dversion}.tar.xz
+Source0:	http://www.imagemagick.org/download/ImageMagick-%{dversion}.tar.xz
 Source1:	ImageMagick.pdf.bz2
 # re-scaled from ftp://ftp.imagemagick.org/pub/ImageMagick/images/magick-icon.png
 Source10:	magick-icon_16x16.png
@@ -51,7 +52,13 @@
 Patch7:		imagemagick-urw.diff
 Patch17:	imagemagick-fpx.diff
 Patch19:	ImageMagick-libpath.diff
-Patch20:	ImageMagick-6.4.8-9-fix-montageimages-test.patch
+Patch20:	ImageMagick-6.7.7-9-fix-montageimages-test.patch
+Patch21:	imagemagick-CVE-2014-2030.patch
+Patch22:	imagemagick-CVE-2014-1958.patch
+Patch23:	imagemagick-CVE-2014-8354.patch
+Patch24:	imagemagick-CVE-2014-8355.patch
+Patch25:	imagemagick-CVE-2014-8562.patch
+Patch26:	imagemagick-CVE-2014-8716.patch
 
 Requires:	%{libname} = %{version}
 Obsoletes:	ImageMagick < 6.3.2.9-6
@@ -71,6 +78,8 @@
 BuildRequires:  libpng-devel
 BuildRequires:  zlib-devel
 BuildRequires:  lcms-devel
+BuildRequires:	lcms2-devel
+BuildRequires:	fftw-devel
 BuildRequires:  lqr-devel
 BuildRequires:  libltdl-devel
 BuildRequires:  perl-devel
@@ -79,6 +88,7 @@
 BuildRequires:  libwmf-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  lzma-devel
+BuildRequires:	pkgconfig(libwebp)
 %if !%bootstrap
 BuildRequires:  djvulibre-devel
 %endif
@@ -98,7 +108,7 @@
 
 %package 	desktop
 Summary:	ImageMagick menus
-Group:		Graphics
+Group:		Graphics/Editors and Converters
 Requires:	xterm
 Obsoletes:	ImageMagick-desktop < 6.3.2.9-6
 
@@ -109,6 +119,7 @@
 %package -n	%{libname}
 Summary:	ImageMagick libraries
 Group:		System/Libraries
+Provides:	%{_lib}magick = %{version}
 # (Anssi 02/2008): Wrongly named at first, can be removed when major changes again:
 Obsoletes:	%{_lib}magick%{major}.0.0 < %{version}-%{release}
 
@@ -158,7 +169,7 @@
 
 %package	doc
 Summary:	%{name} Documentation
-Group:		Books/Other
+Group:		Documentation
 Obsoletes:	ImageMagick-doc < 6.3.2.9-6
 BuildArch:	noarch
 
@@ -175,6 +186,12 @@
 %patch17 -p0 -b .fpx
 %patch19 -p1 -b .libpath
 %patch20 -p1 -b .ppc
+%patch21 -p4 -b .CVE-2014-2030
+%patch22 -p4 -b .CVE-2014-1958
+%patch23 -p1 -b .CVE-2014-8354
+%patch24 -p1 -b .CVE-2014-8355
+%patch25 -p1 -b .CVE-2014-8562
+%patch26 -p1 -b .CVE-2014-8716
 
 bzcat %{SOURCE1} > ImageMagick.pdf
 install -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
@@ -194,7 +211,6 @@
     --with-pic \
     --enable-shared --disable-static \
     --enable-fast-install \
-    --disable-ltdl-install \
     --with-threads \
     --with-magick_plus_plus \
     --with-gslib \
@@ -206,16 +222,11 @@
     --without-windows-font-dir \
     --with-modules \
     --with-perl \
-    --without-included-ltdl --with-ltdl-include=%{_includedir} \
-    --with-ltdl-lib=%{_libdir} \
     --with-perl-options="INSTALLDIRS=vendor CC='%{__cc} -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
     --with-jp2 \
     --with-gvc \
     --with-lqr
 
-# without the following, it doesn't build correctly with "make -j 4"
-perl -lpi -e '$_ .= " magick/libMagickCore.la" if index($_, q($(PERLMAKEFILE))) == 0' Makefile
-
 # Disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -246,6 +257,11 @@
 # Remove unpackaged files
 find %{buildroot} -name '*.la' -delete
 
+# create compatible symlinks
+ln -s libMagick++-%{qlev}.so %{buildroot}%{_libdir}/libMagick++.so
+ln -s libMagickCore-%{qlev}.so %{buildroot}%{_libdir}/libMagickCore.so
+ln -s libMagickWand-%{qlev}.so %{buildroot}%{_libdir}/libMagickWand.so
+
 %multiarch_binaries %{buildroot}%{_bindir}/Magick-config
 %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config
 %multiarch_binaries %{buildroot}%{_bindir}/MagickCore-config
@@ -306,9 +322,9 @@
 %{_iconsdir}/hicolor/64x64/apps/%{name}.png
 
 %files -n %{libname}
-%{_libdir}/libMagick++.so.%{major}*
-%{_libdir}/libMagickCore.so.%{major}*
-%{_libdir}/libMagickWand.so.%{major}*
+%{_libdir}/libMagick++-%{qlev}.so.%{major}*
+%{_libdir}/libMagickCore-%{qlev}.so.%{major}*
+%{_libdir}/libMagickWand-%{qlev}.so.%{major}*
 
 %files -n %{develname}
 %{_includedir}/ImageMagick