--- cauldron/imagemagick/current/SPECS/imagemagick.spec	2011/05/20 22:51:29	99994
+++ cauldron/imagemagick/current/SPECS/imagemagick.spec	2011/08/20 09:18:22	134495
@@ -9,10 +9,10 @@
 # V E R S I O N   P A R T S
 
 # their "official" version
-%define rversion 6.6.6
+%define rversion 6.7.1
 
 # their "minor" version
-%define minor_rev 10
+%define minor_rev 8
 
 # some other funny version
 # (aw) from the docs: Versions with Q8 in the name are 8 bits-per-pixel
@@ -33,7 +33,7 @@
 Summary:	An X application for displaying and manipulating images
 Name:		imagemagick
 Version:	%{rversion}.%{minor_rev}
-Release:	%mkrel 5
+Release:	%mkrel 1
 License:	BSD-like
 Group:		Graphics
 URL:		http://www.imagemagick.org/
@@ -46,55 +46,44 @@
 Source13:	magick-icon_64x64.png
 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
+Patch1:		ImageMagick-6.4.8-9-format-strings.patch
 Patch4:		ImageMagick-6.4.8-9-includedir.patch
 Patch7:		imagemagick-urw.diff
 Patch17:	imagemagick-fpx.diff
 Patch19:	ImageMagick-libpath.diff
 Patch20:	ImageMagick-6.4.8-9-fix-montageimages-test.patch
+
 Requires:	%{libname} = %{version}
 Obsoletes:	ImageMagick < 6.3.2.9-6
 Provides:	ImageMagick = %{version}-%{release}
-BuildRequires:	XFree86-devel
-BuildRequires:	avahi-client-devel
-BuildRequires:	avahi-common-devel
-BuildRequires:	avahi-glib-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	cairo-devel
-BuildRequires:	chrpath
-BuildRequires:	dbus-glib-devel
+
+BuildRequires:  libx11-devel
+BuildRequires:  libxext-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  cairo-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  freetype2-devel >= 2.1.7
+BuildRequires:  chrpath
+BuildRequires:  graphviz-devel >= 2.9.0
+BuildRequires:  libjasper-devel
+BuildRequires:  libjbig-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  zlib-devel
+BuildRequires:  lcms-devel
+BuildRequires:  lqr-devel
+BuildRequires:  libltdl-devel
+BuildRequires:  perl-devel
+BuildRequires:  librsvg-devel
+BuildRequires:  tiff-devel
+BuildRequires:  libwmf-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  lzma-devel
 %if !%bootstrap
-BuildRequires:	djvulibre-devel
+BuildRequires:  djvulibre-devel
 %endif
-BuildRequires:	expat-devel
-BuildRequires:	fontconfig-devel
-BuildRequires:	freetype2-devel >= 2.1.7
-BuildRequires:	gd-devel
-BuildRequires:	ghostscript
-BuildRequires:	glib2-devel
-BuildRequires:	gnome-vfs2-devel
-BuildRequires:	graphviz-devel >= 2.9.0
-BuildRequires:	lcms-devel >= 1.15
-BuildRequires:	libGConf2-devel
-BuildRequires:	libcroco0.6-devel
-BuildRequires:	libexif-devel
-BuildRequires:	libgdk_pixbuf2.0-devel
-BuildRequires:	libgsf-devel
-BuildRequires:	libjasper-devel
-BuildRequires:	libjbig-devel
-BuildRequires:	libltdl-devel >= 1.4.3-10
-BuildRequires:	librsvg-devel
-BuildRequires:	libwmf
-BuildRequires:	libwmf-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	lqr-devel
-BuildRequires:	openssl-devel
-BuildRequires:	pango-devel
-BuildRequires:	perl-devel
-BuildRequires:	pixman-devel
-BuildRequires:	tiff-devel
-BuildConflicts:	%{develname}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  ghostscript
+BuildConflicts: %{develname}
 
 %description
 ImageMagick is a powerful image display, conversion and manipulation tool. It
@@ -198,7 +187,7 @@
 export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIC"
 
 # don't use icecream
-export PATH=/bin:/usr/bin:/usr/X11R6/bin
+export PATH=/bin:/usr/bin
 
 %configure2_5x \
     --docdir=%{_defaultdocdir}/imagemagick \
@@ -289,7 +278,7 @@
 Icon=%{name}
 Terminal=false
 Type=Application
-Categories=X-MandrivaLinux-Office-Graphs;Graphics;Viewer;
+Categories=Graphics;Viewer;
 EOF
 
 %clean
@@ -298,6 +287,7 @@
 %files
 %defattr(-,root,root)
 %doc README.txt
+%{_sysconfdir}/ImageMagick
 %{_bindir}/animate
 %{_bindir}/compare
 %{_bindir}/composite
@@ -312,12 +302,7 @@
 %dir %{_libdir}/ImageMagick-%{rversion}
 %dir %{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}
 %dir %{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/coders
-%dir %{_libdir}/ImageMagick-%{rversion}/config
 %{_datadir}/ImageMagick-%{rversion}
-%{_libdir}/ImageMagick-%{rversion}/config/*.xml
-#%{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/filters
-#%{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/coders/*.so
-#%{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/coders/*.la
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %exclude %{_mandir}/man3/*::*.3pm*