Changes of Revision 11
[-] | Changed | php5-imagick.spec |
x 1
2 URL: http://pecl.php.net/package/imagick/ 3 Source: http://pecl.php.net/package/imagick/imagick-%{version}.tgz 4 Patch: imagick-exception.diff 5 +Patch1: imagick-0.9.13-newerImageMagick.patch 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build 7 BuildRequires: php5-devel ImageMagick-devel 8 Requires: php5 9
10 %prep 11 %setup -n imagick-%{version} 12 %patch -p1 13 +%if 0%{?sles_version} >= 11 14 +%patch1 -p1 15 +%endif 16 + 17 %build 18 /usr/bin/phpize 19 CFLAGS="%{optflags} -fno-strict-aliasing" 20 |
||
[+] | Added | imagick-0.9.13-newerImageMagick.patch ^ |
@@ -0,0 +1,31 @@ +--- imagick-0.9.13.orig/config.m4 2007-04-12 19:02:45.000000000 +0200 ++++ imagick-0.9.13/config.m4 2010-04-10 14:42:56.000000000 +0200 +@@ -21,12 +21,12 @@ + AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [ ]) + AC_MSG_RESULT(Building with GraphicsMagick as backend) + else +- GM_PATH="" ++ GM_PATH="ImageMagick/" + MAGICK_NAME="ImageMagick" + NEEDED_VERSION=5005003 + NEEDED_VERSION_STRING=5.5.3 + CONFIG_NAME="Magick-config" +- LIB_NAME="Magick" ++ LIB_NAME="MagickCore" + AC_DEFINE(IMAGICK_BACKEND, "ImageMagick", [ ]) + AC_DEFINE(HAVE_IMAGEMAGICK, 1, [ ]) + AC_MSG_RESULT(Building with ImageMagick as backend) +@@ -98,11 +98,11 @@ + if test "$MAGICK_NAME" = "ImageMagick" && test "$imagemagick_version" -ge 6000000; then + AC_MSG_RESULT(yes. Adding compatibility options) + AC_DEFINE(IMAGICK_NEEDS_WAND,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(Wand, $IMAGEMAGICK_DIR/lib, IMAGICK_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(MagickWand, $IMAGEMAGICK_DIR/$PHP_LIBDIR, IMAGICK_SHARED_LIBADD) + elif test "$MAGICK_NAME" = "GraphicsMagick" && test "$imagemagick_version" -ge 1001000; then + AC_MSG_RESULT(yes. Adding compatibility options) + AC_DEFINE(IMAGICK_NEEDS_WAND,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(GraphicsMagickWand, $IMAGEMAGICK_DIR/lib, IMAGICK_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(GraphicsMagickWand, $IMAGEMAGICK_DIR/$PHP_LIBDIR, IMAGICK_SHARED_LIBADD) + else + AC_MSG_RESULT(no) + fi |