rpms/php-magickwand/F-9 php-magickwand-1.0.7-fedora.patch, NONE, 1.1 php-magickwand.spec, 1.7, 1.8

[Robert Scheck (robert)]

Author: robert

Update of /cvs/extras/rpms/php-magickwand/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26283/F-9

Modified Files:
	php-magickwand.spec 
Added Files:
	php-magickwand-1.0.7-fedora.patch 
Log Message:
Work around some upstream dumbness...

php-magickwand-1.0.7-fedora.patch:

--- NEW FILE php-magickwand-1.0.7-fedora.patch ---
Hack by Robert Scheck <robert at fedoraproject.org> for php-magickwand >= 1.0.7, which
unbreaks php-magickwand, because upstream is too lazy to define the requirements of
the needed ImageMagick version sane. So let's avoid rebuilding issues...

--- MagickWandForPHP-1.0.7/config.m4		2008-04-13 19:30:55.000000000 +0200
+++ MagickWandForPHP-1.0.7/config.m4.fedora	2008-04-27 12:55:20.000000000 +0200
@@ -3,34 +3,34 @@
 
 if test $PHP_MAGICKWAND != "no"; then
 
-    if test -r $PHP_MAGICKWAND/bin/MagickWand-config; then
+    if test -r $PHP_MAGICKWAND/bin/Wand-config; then
         WAND_CONFIG_PATH=$PHP_MAGICKWAND/bin
     else
-        AC_MSG_CHECKING(MagickWand-config in default path)
+        AC_MSG_CHECKING(Wand-config in default path)
 
         for i in /usr/local /usr;
         do
-            test -r $i/bin/MagickWand-config && WAND_CONFIG_PATH=$i/bin && break
+            test -r $i/bin/Wand-config && WAND_CONFIG_PATH=$i/bin && break
         done
 
         if test -z "$WAND_CONFIG_PATH"; then
             for i in $PHP_MAGICKWAND /usr/local /usr;
             do
-                test -r $i/MagickWand-config && WAND_CONFIG_PATH=$i && break
+                test -r $i/Wand-config && WAND_CONFIG_PATH=$i && break
             done
         fi
         if test -z "$WAND_CONFIG_PATH"; then
-            AC_MSG_ERROR(Cannot locate configuration program MagickWand-config)
+            AC_MSG_ERROR(Cannot locate configuration program Wand-config)
         else
             AC_MSG_RESULT(found in $WAND_CONFIG_PATH)
         fi
     fi
 
-		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/MagickWand-config --version`
+		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
 		IMAGEMAGICK_VERSION_MASK=`echo ${IMAGEMAGICK_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 
 
-		AC_MSG_CHECKING(if ImageMagick version is at least 6.3.5)
+		AC_MSG_CHECKING(if ImageMagick version is at least 6.3.8)
 		if test "$IMAGEMAGICK_VERSION_MASK" -ge 6003005; then
 				AC_MSG_RESULT(found version $IMAGEMAGICK_VERSION_ORIG)
 		else
@@ -63,16 +63,16 @@
 
 		AC_DEFINE(HAVE_MAGICKWAND,1,[ ])
 
-		PHP_ADD_LIBRARY_WITH_PATH(MagickCore, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
-		PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
+		PHP_ADD_LIBRARY_WITH_PATH(Magick, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
+		PHP_ADD_LIBRARY_WITH_PATH(Wand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
 		PHP_ADD_INCLUDE($WAND_DIR/include/ImageMagick)
-		AC_MSG_CHECKING(MagickWand-config --cppflags)
-		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/MagickWand-config --cppflags`"
+		AC_MSG_CHECKING(Wand-config --cppflags)
+		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
 		AC_MSG_RESULT($WAND_CPPFLAGS)
 		PHP_EVAL_INCLINE($WAND_CPPFLAGS)
 
-		AC_MSG_CHECKING(MagickWand-config --libs)
-		WAND_LIBS="`$WAND_CONFIG_PATH/MagickWand-config --libs`"
+		AC_MSG_CHECKING(Wand-config --libs)
+		WAND_LIBS="`$WAND_CONFIG_PATH/Wand-config --libs`"
 		AC_MSG_RESULT($WAND_LIBS)
 		PHP_EVAL_LIBLINE($WAND_LIBS, MAGICKWAND_SHARED_LIBADD)
 


Index: php-magickwand.spec
===================================================================
RCS file: /cvs/extras/rpms/php-magickwand/F-9/php-magickwand.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-magickwand.spec	27 Apr 2008 10:28:04 -0000	1.7
+++ php-magickwand.spec	27 Apr 2008 11:02:49 -0000	1.8
@@ -9,6 +9,7 @@
 # Only latest version is always kept on: http://www.magickwand.org/download/php/
 Source0:	http://image_magick.veidrodis.com/image_magick/php/MagickWandForPHP-%{version}.tar.gz
 Source1:	magickwand.ini
+Patch:		php-magickwand-1.0.7-fedora.patch
 URL:		http://www.magickwand.org/
 BuildRequires:	php-devel >= 4.3.0, ImageMagick-devel >= 6.3.8, autoconf, automake, libtool
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n MagickWandForPHP-%{version}
+%patch -p1 -b .fedora
 export PHP_RPATH=no
 phpize
 %configure