--- cauldron/imagemagick/current/SPECS/imagemagick.spec	2011/08/21 13:53:43	134767
+++ cauldron/imagemagick/current/SPECS/imagemagick.spec	2012/03/03 07:54:56	217114
@@ -9,10 +9,10 @@
 # V E R S I O N   P A R T S
 
 # their "official" version
-%define rversion 6.7.1
+%define rversion 6.7.5
 
 # their "minor" version
-%define minor_rev 9
+%define minor_rev 8
 
 # 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 4
+%define major 5
 
 %define libname %mklibname magick %{major}
 %define develname %mklibname magick -d
@@ -37,7 +37,7 @@
 License:	BSD-like
 Group:		Graphics
 URL:		http://www.imagemagick.org/
-Source0:	ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ImageMagick-%{dversion}.tar.xz
+Source0:	ftp://ftp.imagemagick.org/pub/ImageMagick/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
@@ -47,7 +47,7 @@
 Patch0:		imagemagick-docdir.diff
 #gw fix format strings, but it doesn't work for the perl-Magick
 Patch1:		ImageMagick-6.4.8-9-format-strings.patch
-Patch4:		ImageMagick-6.4.8-9-includedir.patch
+Patch2:		ImageMagick-6.7.4-force-so.patch
 Patch7:		imagemagick-urw.diff
 Patch17:	imagemagick-fpx.diff
 Patch19:	ImageMagick-libpath.diff
@@ -92,7 +92,7 @@
 
 ImageMagick can make use of the following delegate programs, available as
 packages in %{_vendor}: curl enscript ffmpeg ghostscript ghostscript-X gimp
-gnuplot graphviz html2ps mplayer ncompress netpbm sane-backends tetex-dvips
+gnuplot graphviz html2ps mplayer ncompress netpbm sane-backends texlive-texmf
 transfig ufraw xdg-utils zip autotrace povray
 
 %package 	desktop
@@ -126,6 +126,7 @@
 Obsoletes:	ImageMagick-devel
 Provides:	libMagick5-devel = %{version}-%{release}
 Obsoletes:	libMagick5-devel
+Conflicts:	%{name} < 6.7.5.0-2
 # 2006
 Obsoletes:	%{mklibname Magick 8.3.2 -d}
 # 2007.0
@@ -149,8 +150,6 @@
 Requires:	%{name} = %{version}
 Provides:	perl-Magick = %{version}-%{release}
 Obsoletes:	perl-Magick
-Requires:	graphviz
-Requires:	libwmf
 
 %description -n	perl-Image-Magick
 This is the ImageMagick perl support package. It includes perl modules and
@@ -160,6 +159,7 @@
 Summary:	%{name} Documentation
 Group:		Books/Other
 Obsoletes:	ImageMagick-doc < 6.3.2.9-6
+BuildArch:	noarch
 
 %description	doc
 This package contains HTML/PDF documentation of %{name}.
@@ -170,7 +170,7 @@
 
 %patch0 -p1 -b .docdir
 #patch1 -p1
-%patch4 -p1 -b .include
+%patch2 -p0 -b .so
 %patch7 -p0 -b .urw
 %patch17 -p0 -b .fpx
 %patch19 -p1 -b .libpath
@@ -192,7 +192,7 @@
 %configure2_5x \
     --docdir=%{_defaultdocdir}/imagemagick \
     --with-pic \
-    --enable-shared \
+    --enable-shared --disable-static \
     --enable-fast-install \
     --disable-ltdl-install \
     --with-threads \
@@ -204,8 +204,10 @@
     --with-xml \
     --without-dps \
     --without-windows-font-dir \
-    --without-modules \
+    --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 \
@@ -235,8 +237,6 @@
 %endif
 
 %install
-rm -rf %{buildroot}
-
 # (Abel) set LD_RUN_PATH to null, to avoid adding rpath to perlmagick module
 %makeinstall_std LD_RUN_PATH="" pkgdocdir=/installed_docs
 
@@ -244,9 +244,7 @@
 rm -rf installed_docs; mv %{buildroot}/installed_docs .
 
 # Remove unpackaged files
-rm -f %{buildroot}%{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/coders/*.a \
-      %{buildroot}%{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/filters/*.a \
-      %{buildroot}%{_libdir}/libltdl* 
+find %{buildroot} -name '*.la' -delete
 
 %multiarch_binaries %{buildroot}%{_bindir}/Magick-config
 %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config
@@ -281,11 +279,7 @@
 Categories=Graphics;Viewer;
 EOF
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
 %doc README.txt
 %{_sysconfdir}/ImageMagick
 %{_bindir}/animate
@@ -299,16 +293,12 @@
 %{_bindir}/mogrify
 %{_bindir}/montage
 %{_bindir}/stream
-%dir %{_libdir}/ImageMagick-%{rversion}
-%dir %{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}
-%dir %{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/coders
+%{_libdir}/ImageMagick-%{rversion}
 %{_datadir}/ImageMagick-%{rversion}
 %{_mandir}/man1/*
-%{_mandir}/man3/*
-%exclude %{_mandir}/man3/*::*.3pm*
+%exclude %{_mandir}/man1/*-config.*
 
 %files desktop
-%defattr(-,root,root)
 %{_datadir}/applications/*
 %{_iconsdir}/%{name}.png
 %{_liconsdir}/%{name}.png
@@ -316,13 +306,11 @@
 %{_iconsdir}/hicolor/64x64/apps/%{name}.png
 
 %files -n %{libname}
-%defattr(-,root,root,0755)
 %{_libdir}/libMagick++.so.%{major}*
 %{_libdir}/libMagickCore.so.%{major}*
 %{_libdir}/libMagickWand.so.%{major}*
 
 %files -n %{develname}
-%defattr(-,root,root)
 %{_includedir}/ImageMagick
 %multiarch %{multiarch_bindir}/Magick-config
 %multiarch %{multiarch_bindir}/Magick++-config
@@ -337,20 +325,15 @@
 %{_bindir}/MagickCore-config
 %{_bindir}/MagickWand-config
 %{_bindir}/Wand-config
-%attr(0644,root,root) %{_libdir}/*.a
-%attr(0644,root,root) %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_mandir}/man1/*-config.*
 
 %files -n perl-Image-Magick
-%defattr(-,root,root)
 %{perl_vendorarch}/Image
 %{perl_vendorarch}/auto/Image
 %{_mandir}/man3*/*::*.3pm*
 
 %files doc
-%defattr(-,root,root)
 %doc ImageMagick.pdf ChangeLog LICENSE NEWS* NOTICE
 %doc QuickStart.txt installed_docs/*
-
-