diff options
| -rw-r--r-- | imagick-incl.patch | 13 | ||||
| -rw-r--r-- | php-pecl-imagick.spec | 13 |
2 files changed, 23 insertions, 3 deletions
diff --git a/imagick-incl.patch b/imagick-incl.patch new file mode 100644 index 0000000..2f5f236 --- /dev/null +++ b/imagick-incl.patch @@ -0,0 +1,13 @@ +--- imagick-3.1.0RC2/config.m4 2012-05-30 22:21:12.000000000 +0200 ++++ imagick-3.1.0RC2/config.m4 2013-03-13 13:55:38.292504304 +0100 +@@ -52,7 +52,9 @@ + else + AC_MSG_CHECKING(for MagickWand.h header file) + +- if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then ++ if test -r $WAND_DIR/include/ImageMagick-6/wand/MagickWand.h; then ++ AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick-6/wand/MagickWand.h) ++ elif test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then + AC_MSG_RESULT(found in $WAND_DIR/include/ImageMagick/wand/MagickWand.h) + else + AC_MSG_ERROR(Cannot locate header file MagickWand.h) diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index 98fa74d..22c74f3 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -6,16 +6,18 @@ Summary: Extension to create and modify images using ImageMagick Name: php-pecl-imagick Version: 3.1.0 -Release: 0.7.%{prever}%{?dist} +Release: 0.8.%{prever}%{?dist}.1 License: PHP Group: Development/Languages URL: http://pecl.php.net/package/imagick -Source: http://pecl.php.net/get/imagick-%{version}%{?prever}.tgz +Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +# http://svn.php.net/viewvc?view=revision&revision=329769 +Patch0: %{pecl_name}-incl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php-devel >= 5.1.3, php-pear -%if 0%{?fedora} >= 17 +%if 0%{?fedora} > 20 BuildRequires: ImageMagick-devel >= 6.7.5 %else BuildRequires: ImageMagick-last-devel >= 6.7.5 @@ -62,6 +64,8 @@ extension = %{pecl_name}.so ;imagick.progress_monitor=0 EOF +%patch0 -p0 -b .inclpath + cp -r %{pecl_name}-%{version}%{?prever} %{pecl_name}-%{version}-zts @@ -134,6 +138,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 13 2013 Remi Collet <rpms@famillecollet.com> - 3.1.0-0.8.RC2 +- rebuild against new ImageMagick-last version 6.8.3.9 + * Fri Nov 30 2012 Remi Collet <remi@fedoraproject.org> - 3.1.0-0.5.RC2 - also provides php-imagick |