rpms/ImageMagick/devel ImageMagick-6.2.8-multilib.patch, NONE, 1.1 ImageMagick.spec, 1.62, 1.63

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10159

Modified Files:
	ImageMagick.spec 
Added Files:
	ImageMagick-6.2.8-multilib.patch 
Log Message:
work on 6.2.8


ImageMagick-6.2.8-multilib.patch:
 magick/Magick-config.in |   16 ++++++++--------
 wand/Wand-config.in     |   16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE ImageMagick-6.2.8-multilib.patch ---
--- 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


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ImageMagick.spec	9 Jun 2006 13:29:49 -0000	1.62
+++ ImageMagick.spec	9 Jun 2006 14:25:08 -0000	1.63
@@ -21,7 +21,7 @@
 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 @@
 %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