summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-09-08 16:30:06 +0200
committerRemi Collet <fedora@famillecollet.com>2013-09-08 16:30:06 +0200
commite232dd84df5a33884895aaa3147192814df7551d (patch)
tree5185453ea540376a05073b507eb81ae86e13f550
parent7839d24311cce6f75cb0b01b9d50f42050ef3645 (diff)
php-pecl-imagick: 3.1.0 (beta)
-rw-r--r--imagick-incl.patch13
-rw-r--r--php-pecl-imagick.spec26
2 files changed, 14 insertions, 25 deletions
diff --git a/imagick-incl.patch b/imagick-incl.patch
deleted file mode 100644
index 2f5f236..0000000
--- a/imagick-incl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 37f663d..b866292 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -1,7 +1,7 @@
%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
%global pecl_name imagick
-%global prever RC2
+#global prever RC2
# We don't really rely on upstream ABI
%global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)
@@ -9,15 +9,12 @@
Summary: Extension to create and modify images using ImageMagick
Name: php-pecl-imagick
Version: 3.1.0
-Release: 0.10.%{prever}%{?dist}.1
+Release: 1%{?dist}.1
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/imagick
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} >= 20
@@ -67,13 +64,15 @@ cat > %{pecl_name}.ini << 'EOF'
; Enable %{pecl_name} extension module
extension = %{pecl_name}.so
-; Options not documented
+; Documentation: http://php.net/imagick
+
+; Fixes a drawing bug with locales that use ',' as float separators.
;imagick.locale_fix=0
+
+; Used to enable the image progress monitor.
;imagick.progress_monitor=0
EOF
-%patch0 -p0 -b .inclpath
-
cp -r %{pecl_name}-%{version}%{?prever} %{pecl_name}-%{version}-zts
@@ -146,6 +145,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Sep 8 2013 Remi Collet <rpms@famillecollet.com> - 3.1.0-1
+- update to 3.1.0 (beta)
+
* Sun Jun 2 2013 Remi Collet <rpms@famillecollet.com> - 3.1.0-0.10.RC2
- rebuild against new ImageMagick-last version 6.8.5-9
@@ -174,10 +176,10 @@ rm -rf %{buildroot}
* Mon Oct 03 2011 Remi Collet <Fedora@FamilleCollet.com> - 3.0.1-3.1
- spec cleanup
-* Tue Aug 24 2011 Remi Collet <Fedora@FamilleCollet.com> - 3.0.1-3
+* Wed Aug 24 2011 Remi Collet <Fedora@FamilleCollet.com> - 3.0.1-3
- build zts extension
-* Sun Dec 27 2010 Remi Collet <rpms@famillecollet.com> 3.0.1-2
+* Mon Dec 27 2010 Remi Collet <rpms@famillecollet.com> 3.0.1-2
- relocate using phpname macro
* Fri Nov 26 2010 Remi Collet <rpms@famillecollet.com> 3.0.1-1.1
@@ -195,10 +197,10 @@ rm -rf %{buildroot}
* Mon Aug 24 2009 Remi Collet <rpms@famillecollet.com> 2.3.0-1
- update to 2.3.0
-* Wed Jun 30 2009 Remi Collet <rpms@famillecollet.com> 2.2.2-3.###.remi
+* Tue Jun 30 2009 Remi Collet <rpms@famillecollet.com> 2.2.2-3.###.remi
- rebuild for PHP 5.3.0 (API = 20090626)
-* Thu Apr 25 2009 Remi Collet <rpms@famillecollet.com> 2.2.2-2.fc11.remi
+* Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> 2.2.2-2.fc11.remi
- F11 rebuild for PHP 5.3.0RC1
* Wed Feb 25 2009 Remi Collet <rpms@famillecollet.com> 2.2.2-1.fc10.remi