[packages/php-pecl-imagick: 3/3] Merge branch 'DEVEL', updated to 3.1.2

[glen]

commit a9be72e76f0cc02bdf223f920c4dc3fdb58cbb49
Merge: 696a2b4 b5d4400
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 21 22:32:28 2013 +0200

    Merge branch 'DEVEL', updated to 3.1.2
    
    Conflicts:
    	php-pecl-imagick.spec

 php-pecl-imagick.spec | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --cc php-pecl-imagick.spec
index b76cc7c,f9aa4c4..c82d92c
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@@ -4,14 -4,12 +4,13 @@@
  Summary:	%{modname} - PHP wrapper to the Image Magick Library
  Summary(pl.UTF-8):	%{modname} - PHP-owy wrapper do biblioteki Image Magick
  Name:		%{php_name}-pecl-%{modname}
- # NOTE: 3.1.x in DEVEL branch
- Version:	3.0.1
- Release:	5
 -Version:	3.1.0
 -Release:	0.RC2.1
++Version:	3.1.2
++Release:	1
  License:	PHP 3.01
  Group:		Development/Languages/PHP
 -Source0:	http://pecl.php.net/get/%{modname}-%{version}RC2.tgz
 -# Source0-md5:	de9cca809fb2db61f4cbd9fac4f69314
 +Source0:	http://pecl.php.net/get/%{modname}-%{version}.tgz
- # Source0-md5:	e2167713316639705202cf9b6cb1fdb1
++# Source0-md5:	f2fd71b026debe056e0ec8d76c2ffe94
 +Patch0:		ImageMagick-6.8.patch
  URL:		http://pecl.php.net/package/imagick/
  BuildRequires:	%{php_name}-devel >= 3:5.1.3
  BuildRequires:	ImageMagick-devel >= 1:6.2.4.0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-imagick.git/commitdiff/a9be72e76f0cc02bdf223f920c4dc3fdb58cbb49