From 1c0a761c821149aef2893b950c330e8edb6b1ab7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jun 09 2006 14:25:08 +0000
Subject: work on 6.2.8


---

diff --git a/ImageMagick-6.2.8-multilib.patch b/ImageMagick-6.2.8-multilib.patch
new file mode 100644
index 0000000..9063b0b
--- /dev/null
+++ b/ImageMagick-6.2.8-multilib.patch
@@ -0,0 +1,78 @@
+--- ImageMagick-6.2.8/magick/Magick-config.in.multilib	2006-05-26 21:58:55.000000000 -0400
++++ ImageMagick-6.2.8/magick/Magick-config.in	2006-06-09 10:12:09.000000000 -0400
+@@ -15,28 +15,28 @@
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      pkg-config --variable prefix ImageMagick
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      pkg-config --variable exec_prefix ImageMagick
+       ;;
+     --version)
+-      echo @PACKAGE_VERSION@
++      pkg-config --modversion ImageMagick
+       ;;
+     --cflags)
+-      echo '@MAGICK_CFLAGS@'
++      pkg-config --cflags ImageMagick
+       ;;
+     --cxxflags)
+-      echo '@MAGICK_CXXFLAGS@'
++      pkg-config --cflags ImageMagick
+       ;;
+     --cppflags)
+-      echo '@MAGICK_CPPFLAGS@'
++      pkg-config --cflags ImageMagick
+       ;;
+     --ldflags)
+-      echo '@MAGICK_LDFLAGS@'
++      pkg-config --libs ImageMagick
+       ;;
+     --libs)
+-      echo '@MAGICK_LIBS@ -lWand -lMagick'
++      pkg-config --libs ImageMagick
+       ;;
+     *)
+       echo "${usage}" 1>&2
+--- ImageMagick-6.2.8/wand/Wand-config.in.multilib	2006-05-26 21:58:55.000000000 -0400
++++ ImageMagick-6.2.8/wand/Wand-config.in	2006-06-09 10:16:55.000000000 -0400
+@@ -15,28 +15,28 @@
+ while test $# -gt 0; do
+   case $1 in
+     --prefix)
+-      echo @PREFIX_DIR@
++      pkg-config --variable prefix Wand
+       ;;
+     --exec-prefix)
+-      echo @EXEC_PREFIX_DIR@
++      pkg-config --variable exec_prefix Wand
+       ;;
+     --version)
+-      echo @PACKAGE_VERSION@
++      pkg-config --modversion Wand
+       ;;
+     --cflags)
+-      echo '@MAGICK_CFLAGS@'
++      pkg-config --cflags Wand
+       ;;
+     --cxxflags)
+-      echo '@MAGICK_CXXFLAGS@'
++      pkg-config --cflags Wand
+       ;;
+     --cppflags)
+-      echo '@MAGICK_CPPFLAGS@'
++      pkg-config --cflags Wand
+       ;;
+     --ldflags)
+-      echo '@MAGICK_LDFLAGS@'
++      pkg-config --libs Wand
+       ;;
+     --libs)
+-      echo '@MAGICK_LIBS@ -lWand -lMagick'
++      pkg-config --libs Wand
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/ImageMagick.spec b/ImageMagick.spec
index e413be2..5e10c58 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -21,7 +21,7 @@ Source1: magick_small.png
 Patch1: ImageMagick-6.2.1-local_doc.patch
 Patch2: ImageMagick-6.2.5-format-string-again.patch
 Patch3: ImageMagick-6.2.5-yet-another-overflow.patch
-Patch4: ImageMagick-6.2.5-multilib.patch
+Patch4: ImageMagick-6.2.8-multilib.patch
 
 Url: http://www.imagemagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -116,8 +116,8 @@ however.
 %prep
 %setup -q -n %{name}-%{VER}
 %patch1 -p1 -b .local_doc
-%patch2 -p1 -b .format-string-again
-%patch3 -p1 -b .yet-another-overflow
+#%patch2 -p1 -b .format-string-again
+#%patch3 -p1 -b .yet-another-overflow
 %patch4 -p1 -b .multilib
 
 %build