--- cauldron/imagemagick/current/SPECS/imagemagick.spec	2011/08/20 09:18:22	134495
+++ cauldron/imagemagick/current/SPECS/imagemagick.spec	2011/11/16 02:16:31	168068
@@ -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.3
 
 # their "minor" version
-%define minor_rev 8
+%define minor_rev 6
 
 # 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
@@ -47,7 +47,6 @@
 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
 Patch7:		imagemagick-urw.diff
 Patch17:	imagemagick-fpx.diff
 Patch19:	ImageMagick-libpath.diff
@@ -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,6 @@
 
 %patch0 -p1 -b .docdir
 #patch1 -p1
-%patch4 -p1 -b .include
 %patch7 -p0 -b .urw
 %patch17 -p0 -b .fpx
 %patch19 -p1 -b .libpath
@@ -192,7 +191,7 @@
 %configure2_5x \
     --docdir=%{_defaultdocdir}/imagemagick \
     --with-pic \
-    --enable-shared \
+    --enable-shared --disable-static \
     --enable-fast-install \
     --disable-ltdl-install \
     --with-threads \
@@ -244,9 +243,8 @@
 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' | xargs rm
+rm -f %{buildroot}%{_libdir}/libltdl* 
 
 %multiarch_binaries %{buildroot}%{_bindir}/Magick-config
 %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config
@@ -337,8 +335,6 @@
 %{_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
 
@@ -352,5 +348,3 @@
 %defattr(-,root,root)
 %doc ImageMagick.pdf ChangeLog LICENSE NEWS* NOTICE
 %doc QuickStart.txt installed_docs/*
-
-