php-pecl-imagick: 3.3.0RC1

3 files changed, 421 insertions, 79 deletions

diff --git a/REFLECTION b/REFLECTION
index 05c76ca..f7a6f1d 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,15 +1,22 @@
-Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
+Extension [ <persistent> extension #101 imagick version 3.3.0RC1 ] {
+
+  - Dependencies {
+    Dependency [ spl (Required) ]
+  }
 
   - INI {
     Entry [ imagick.locale_fix <ALL> ]
       Current = '0'
     }
+    Entry [ imagick.skip_version_check <ALL> ]
+      Current = '0'
+    }
     Entry [ imagick.progress_monitor <SYSTEM> ]
       Current = '0'
     }
   }
 
-  - Classes [8] {
+  - Classes [10] {
     Class [ <internal:imagick> class ImagickException extends Exception ] {
 
       - Constants [0] {
@@ -226,9 +233,63 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
       }
     }
 
+    Class [ <internal:imagick> class ImagickKernelException extends Exception ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [4] {
+        Property [ <default> protected $message ]
+        Property [ <default> protected $code ]
+        Property [ <default> protected $file ]
+        Property [ <default> protected $line ]
+      }
+
+      - Methods [9] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <optional> $message ]
+            Parameter #1 [ <optional> $code ]
+            Parameter #2 [ <optional> $previous ]
+          }
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        }
+
+        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        }
+      }
+    }
+
     Class [ <internal:imagick> <iterateable> class Imagick implements Iterator, Traversable, Countable ] {
 
-      - Constants [464] {
+      - Constants [541] {
         Constant [ integer COLOR_BLACK ] { 11 }
         Constant [ integer COLOR_BLUE ] { 12 }
         Constant [ integer COLOR_CYAN ] { 13 }
@@ -239,8 +300,8 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
         Constant [ integer COLOR_OPACITY ] { 18 }
         Constant [ integer COLOR_ALPHA ] { 19 }
         Constant [ integer COLOR_FUZZ ] { 20 }
-        Constant [ integer IMAGICK_EXTNUM ] { 30200 }
-        Constant [ string IMAGICK_EXTVER ] { 3.2.0RC1 }
+        Constant [ integer IMAGICK_EXTNUM ] { 30300 }
+        Constant [ string IMAGICK_EXTVER ] { 3.3.0RC1 }
         Constant [ integer QUANTUM_RANGE ] { 65535 }
         Constant [ integer USE_ZEND_MM ] { 0 }
         Constant [ integer COMPOSITE_DEFAULT ] { 40 }
@@ -446,6 +507,7 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
         Constant [ integer CHANNEL_INDEX ] { 32 }
         Constant [ integer CHANNEL_ALL ] { 134217727 }
         Constant [ integer CHANNEL_DEFAULT ] { 134217719 }
+        Constant [ integer CHANNEL_RGBA ] { 15 }
         Constant [ integer CHANNEL_TRUEALPHA ] { 64 }
         Constant [ integer CHANNEL_RGBS ] { 128 }
         Constant [ integer CHANNEL_SYNC ] { 256 }
@@ -607,6 +669,8 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
         Constant [ integer RESOURCETYPE_FILE ] { 3 }
         Constant [ integer RESOURCETYPE_MAP ] { 4 }
         Constant [ integer RESOURCETYPE_MEMORY ] { 5 }
+        Constant [ integer RESOURCETYPE_TIME ] { 7 }
+        Constant [ integer RESOURCETYPE_THROTTLE ] { 8 }
         Constant [ integer RESOURCETYPE_THREAD ] { 6 }
         Constant [ integer DISPOSE_UNRECOGNIZED ] { 0 }
         Constant [ integer DISPOSE_UNDEFINED ] { 0 }
@@ -691,14 +755,88 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
         Constant [ integer FUNCTION_UNDEFINED ] { 0 }
         Constant [ integer FUNCTION_POLYNOMIAL ] { 1 }
         Constant [ integer FUNCTION_SINUSOID ] { 2 }
+        Constant [ integer ALPHACHANNEL_BACKGROUND ] { 2 }
+        Constant [ integer FUNCTION_ARCSIN ] { 3 }
+        Constant [ integer FUNCTION_ARCTAN ] { 4 }
         Constant [ integer ALPHACHANNEL_FLATTEN ] { 11 }
         Constant [ integer ALPHACHANNEL_REMOVE ] { 12 }
+        Constant [ integer STATISTIC_GRADIENT ] { 1 }
+        Constant [ integer STATISTIC_MAXIMUM ] { 2 }
+        Constant [ integer STATISTIC_MEAN ] { 3 }
+        Constant [ integer STATISTIC_MEDIAN ] { 4 }
+        Constant [ integer STATISTIC_MINIMUM ] { 5 }
+        Constant [ integer STATISTIC_MODE ] { 6 }
+        Constant [ integer STATISTIC_NONPEAK ] { 7 }
+        Constant [ integer STATISTIC_STANDARD_DEVIATION ] { 8 }
+        Constant [ integer MORPHOLOGY_CONVOLVE ] { 1 }
+        Constant [ integer MORPHOLOGY_CORRELATE ] { 2 }
+        Constant [ integer MORPHOLOGY_ERODE ] { 3 }
+        Constant [ integer MORPHOLOGY_DILATE ] { 4 }
+        Constant [ integer MORPHOLOGY_ERODE_INTENSITY ] { 5 }
+        Constant [ integer MORPHOLOGY_DILATE_INTENSITY ] { 6 }
+        Constant [ integer MORPHOLOGY_DISTANCE ] { 7 }
+        Constant [ integer MORPHOLOGY_OPEN ] { 8 }
+        Constant [ integer MORPHOLOGY_CLOSE ] { 9 }
+        Constant [ integer MORPHOLOGY_OPEN_INTENSITY ] { 10 }
+        Constant [ integer MORPHOLOGY_CLOSE_INTENSITY ] { 11 }
+        Constant [ integer MORPHOLOGY_SMOOTH ] { 12 }
+        Constant [ integer MORPHOLOGY_EDGE_IN ] { 13 }
+        Constant [ integer MORPHOLOGY_EDGE_OUT ] { 14 }
+        Constant [ integer MORPHOLOGY_EDGE ] { 15 }
+        Constant [ integer MORPHOLOGY_TOP_HAT ] { 16 }
+        Constant [ integer MORPHOLOGY_BOTTOM_HAT ] { 17 }
+        Constant [ integer MORPHOLOGY_HIT_AND_MISS ] { 18 }
+        Constant [ integer MORPHOLOGY_THINNING ] { 19 }
+        Constant [ integer MORPHOLOGY_THICKEN ] { 20 }
+        Constant [ integer MORPHOLOGY_VORONOI ] { 21 }
+        Constant [ integer MORPHOLOGY_ITERATIVE ] { 22 }
+        Constant [ integer KERNEL_UNITY ] { 1 }
+        Constant [ integer KERNEL_GAUSSIAN ] { 2 }
+        Constant [ integer KERNEL_DIFFERENCE_OF_GAUSSIANS ] { 3 }
+        Constant [ integer KERNEL_LAPLACIAN_OF_GAUSSIANS ] { 4 }
+        Constant [ integer KERNEL_BLUR ] { 5 }
+        Constant [ integer KERNEL_COMET ] { 6 }
+        Constant [ integer KERNEL_LAPLACIAN ] { 7 }
+        Constant [ integer KERNEL_SOBEL ] { 8 }
+        Constant [ integer KERNEL_FREI_CHEN ] { 9 }
+        Constant [ integer KERNEL_ROBERTS ] { 10 }
+        Constant [ integer KERNEL_PREWITT ] { 11 }
+        Constant [ integer KERNEL_COMPASS ] { 12 }
+        Constant [ integer KERNEL_KIRSCH ] { 13 }
+        Constant [ integer KERNEL_DIAMOND ] { 14 }
+        Constant [ integer KERNEL_SQUARE ] { 15 }
+        Constant [ integer KERNEL_RECTANGLE ] { 16 }
+        Constant [ integer KERNEL_OCTAGON ] { 17 }
+        Constant [ integer KERNEL_DISK ] { 18 }
+        Constant [ integer KERNEL_PLUS ] { 19 }
+        Constant [ integer KERNEL_CROSS ] { 20 }
+        Constant [ integer KERNEL_RING ] { 21 }
+        Constant [ integer KERNEL_PEAKS ] { 22 }
+        Constant [ integer KERNEL_EDGES ] { 23 }
+        Constant [ integer KERNEL_CORNERS ] { 24 }
+        Constant [ integer KERNEL_DIAGONALS ] { 25 }
+        Constant [ integer KERNEL_LINE_ENDS ] { 26 }
+        Constant [ integer KERNEL_LINE_JUNCTIONS ] { 27 }
+        Constant [ integer KERNEL_RIDGES ] { 28 }
+        Constant [ integer KERNEL_CONVEX_HULL ] { 29 }
+        Constant [ integer KERNEL_THIN_SE ] { 30 }
+        Constant [ integer KERNEL_SKELETON ] { 31 }
+        Constant [ integer KERNEL_CHEBYSHEV ] { 32 }
+        Constant [ integer KERNEL_MANHATTAN ] { 33 }
+        Constant [ integer KERNEL_OCTAGONAL ] { 34 }
+        Constant [ integer KERNEL_EUCLIDEAN ] { 35 }
+        Constant [ integer KERNEL_USER_DEFINED ] { 36 }
+        Constant [ integer KERNEL_BINOMIAL ] { 37 }
+        Constant [ integer NORMALIZE_KERNEL_NONE ] { 0 }
+        Constant [ integer NORMALIZE_KERNEL_VALUE ] { 8192 }
+        Constant [ integer NORMALIZE_KERNEL_CORRELATE ] { 65536 }
+        Constant [ integer NORMALIZE_KERNEL_PERCENT ] { 4096 }
       }
 
       - Static properties [0] {
       }
 
-      - Static methods [12] {
+      - Static methods [16] {
         Method [ <internal:imagick> static public method queryformats ] {
 
           - Parameters [1] {
@@ -731,6 +869,12 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> static public method getquantum ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:imagick> static public method getquantumdepth ] {
 
           - Parameters [0] {
@@ -776,12 +920,33 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
             Parameter #1 [ <required> $limit ]
           }
         }
+
+        Method [ <internal:imagick> static public method setregistry ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $key ]
+            Parameter #1 [ <required> $value ]
+          }
+        }
+
+        Method [ <internal:imagick> static public method getregistry ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $key ]
+          }
+        }
+
+        Method [ <internal:imagick> static public method listregistry ] {
+
+          - Parameters [0] {
+          }
+        }
       }
 
       - Properties [0] {
       }
 
-      - Methods [327] {
+      - Methods [343] {
         Method [ <internal:imagick> public method optimizeimagelayers ] {
 
           - Parameters [0] {
@@ -1024,6 +1189,20 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method deleteimageproperty ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $name ]
+          }
+        }
+
+        Method [ <internal:imagick> public method identifyformat ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $embedText ]
+          }
+        }
+
         Method [ <internal:imagick> public method setimageinterpolatemethod ] {
 
           - Parameters [1] {
@@ -1480,7 +1659,8 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
 
         Method [ <internal:imagick, prototype Countable> public method count ] {
 
-          - Parameters [0] {
+          - Parameters [1] {
+            Parameter #0 [ <optional> $mode ]
           }
         }
 
@@ -1753,6 +1933,19 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method setimagecompression ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $COMPRESSION ]
+          }
+        }
+
+        Method [ <internal:imagick> public method getimagecompression ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:imagick> public method annotateimage ] {
 
           - Parameters [5] {
@@ -1979,13 +2172,6 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
-        Method [ <internal:imagick> public method setimagecompression ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $COMPRESSION ]
-          }
-        }
-
         Method [ <internal:imagick> public method setimagedelay ] {
 
           - Parameters [1] {
@@ -2038,6 +2224,13 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method setprogressmonitor ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $callback ]
+          }
+        }
+
         Method [ <internal:imagick> public method setimageresolution ] {
 
           - Parameters [2] {
@@ -2402,6 +2595,13 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method forwardfouriertransformimage ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $magnitude ]
+          }
+        }
+
         Method [ <internal:imagick> public method frameimage ] {
 
           - Parameters [5] {
@@ -2705,6 +2905,14 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method inversefouriertransformimage ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $complement ]
+            Parameter #1 [ <required> $magnitude ]
+          }
+        }
+
         Method [ <internal:imagick> public method levelimage ] {
 
           - Parameters [4] {
@@ -2846,6 +3054,13 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method setimagebiasquantum ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $bias ]
+          }
+        }
+
         Method [ <internal:imagick> public method setimageblueprimary ] {
 
           - Parameters [2] {
@@ -2956,8 +3171,8 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
 
           - Parameters [4] {
             Parameter #0 [ <required> $sharpen ]
-            Parameter #1 [ <required> $alpha ]
-            Parameter #2 [ <required> $beta ]
+            Parameter #1 [ <required> $contrast ]
+            Parameter #2 [ <required> $midpoint ]
             Parameter #3 [ <optional> $CHANNEL ]
           }
         }
@@ -3208,6 +3423,82 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           - Parameters [0] {
           }
         }
+
+        Method [ <internal:imagick> public method brightnesscontrastimage ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> $brightness ]
+            Parameter #1 [ <required> $contrast ]
+            Parameter #2 [ <optional> $CHANNEL ]
+          }
+        }
+
+        Method [ <internal:imagick> public method colormatriximage ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $color_matrix ]
+          }
+        }
+
+        Method [ <internal:imagick> public method selectiveblurimage ] {
+
+          - Parameters [4] {
+            Parameter #0 [ <required> $radius ]
+            Parameter #1 [ <required> $sigma ]
+            Parameter #2 [ <required> $threshold ]
+            Parameter #3 [ <required> $CHANNEL ]
+          }
+        }
+
+        Method [ <internal:imagick> public method statisticimage ] {
+
+          - Parameters [4] {
+            Parameter #0 [ <required> $type ]
+            Parameter #1 [ <required> $width ]
+            Parameter #2 [ <required> $height ]
+            Parameter #3 [ <optional> $CHANNEL ]
+          }
+        }
+
+        Method [ <internal:imagick> public method subimagematch ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> Imagick $Imagick ]
+            Parameter #1 [ <optional> &$offset ]
+            Parameter #2 [ <optional> &$similarity ]
+          }
+        }
+
+        Method [ <internal:imagick> public method morphology ] {
+
+          - Parameters [4] {
+            Parameter #0 [ <required> $morphologyMethod ]
+            Parameter #1 [ <required> $iterations ]
+            Parameter #2 [ <required> ImagickKernel $ImagickKernel ]
+            Parameter #3 [ <optional> $CHANNEL ]
+          }
+        }
+
+        Method [ <internal:imagick> public method filter ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> ImagickKernel $ImagickKernel ]
+            Parameter #1 [ <optional> $CHANNEL ]
+          }
+        }
+
+        Method [ <internal:imagick> public method setantialias ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $antialias ]
+          }
+        }
+
+        Method [ <internal:imagick> public method getantialias ] {
+
+          - Parameters [0] {
+          }
+        }
       }
     }
 
@@ -4300,7 +4591,7 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
       - Properties [0] {
       }
 
-      - Methods [19] {
+      - Methods [21] {
         Method [ <internal:imagick> public method gethsl ] {
 
           - Parameters [0] {
@@ -4391,6 +4682,14 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method ispixelsimilarquantum ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $color ]
+            Parameter #1 [ <optional> $fuzz ]
+          }
+        }
+
         Method [ <internal:imagick> public method ispixelsimilar ] {
 
           - Parameters [2] {
@@ -4406,6 +4705,12 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
           }
         }
 
+        Method [ <internal:imagick> public method getcolorquantum ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:imagick> public method getcolorasstring ] {
 
           - Parameters [0] {
@@ -4432,6 +4737,69 @@ Extension [ <persistent> extension #92 imagick version 3.2.0RC1 ] {
         }
       }
     }
+
+    Class [ <internal:imagick> class ImagickKernel ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [2] {
+        Method [ <internal:imagick> static public method frommatrix ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $array ]
+            Parameter #1 [ <optional> $array ]
+          }
+        }
+
+        Method [ <internal:imagick> static public method frombuiltin ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $kerneltype ]
+            Parameter #1 [ <required> $paramstring ]
+          }
+        }
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [5] {
+        Method [ <internal:imagick> public method addkernel ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> ImagickKernel $ImagickKernel ]
+          }
+        }
+
+        Method [ <internal:imagick> public method getmatrix ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:imagick> public method separate ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:imagick> public method scale ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:imagick> public method addunitykernel ] {
+
+          - Parameters [0] {
+          }
+        }
+      }
+    }
   }
 }
 
diff --git a/imagick-pr35.patch b/imagick-pr35.patch
deleted file mode 100644
index 238c33d..0000000
--- a/imagick-pr35.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ca019ad49cb3ef3140341fd4d109ecd1fcf65447 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 23 Jul 2014 09:24:45 +0200
-Subject: [PATCH] fix Imagick::count() with PHP 5.6.0RC2
-
----
- imagick.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/imagick.c b/imagick.c
-index c1b97d1..fa1c30e 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -2583,6 +2583,19 @@ static void php_imagick_init_globals(zen
- #endif
- }
-
-+#if defined(HAVE_SPL)
-+static int php_imagick_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
-+	{
-+	php_imagick_object *intern= (php_imagick_object *)zend_object_store_get_object(object TSRMLS_CC);
-+
-+	if (intern->magick_wand) {
-+		*count = MagickGetNumberImages(intern->magick_wand);
-+		return SUCCESS;
-+	}
-+	return FAILURE;
-+	}
-+#endif
-+
- #if PHP_VERSION_ID < 50399
- static zval *php_imagick_read_property(zval *object, zval *member, int type TSRMLS_DC)
- #else
-@@ -2796,6 +2809,7 @@ PHP_MINIT_FUNCTION(imagick)
- 	imagick_object_handlers.read_property = php_imagick_read_property;
- 	php_imagick_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
- #if defined(HAVE_SPL)
-+	imagick_object_handlers.count_elements = php_imagick_count_elements;
- 	zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable);
- #else
- 	zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 1, zend_ce_iterator);
diff --git a/php-pecl-imagick-dev.spec b/php-pecl-imagick-dev.spec
index 2a2d6cf..bc71afd 100644
--- a/php-pecl-imagick-dev.spec
+++ b/php-pecl-imagick-dev.spec
@@ -26,16 +26,13 @@
 
 Summary:       Extension to create and modify images using ImageMagick
 Name:          %{?scl_prefix}php-pecl-imagick
-Version:       3.2.0
-Release:       0.10.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:       3.3.0
+Release:       0.2.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/imagick
 Source:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-# https://github.com/mkoppanen/imagick/pull/35
-Patch0:        %{pecl_name}-pr35.patch
-
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: %{?scl_prefix}php-devel
 BuildRequires: %{?scl_prefix}php-pear
@@ -52,8 +49,6 @@ Requires:      ImageMagick-last-libs%{?_isa}  >= %{imbuildver}
 BuildRequires: ImageMagick-devel >= 6.2.4
 %endif
 
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
@@ -66,17 +61,18 @@ Conflicts:     %{?scl_prefix}php-pecl-gmagick
 
 # Other third party repo stuff
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
-Obsoletes:     php53-pecl-imagick
-Obsoletes:     php53u-pecl-imagick
-Obsoletes:     php54-pecl-imagick
-Obsoletes:     php54w-pecl-imagick
+# Other third party repo stuff
+Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
+Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
+Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
 %if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-imagick
-Obsoletes:     php55w-pecl-imagick
+Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-imagick
-Obsoletes:     php56w-pecl-imagick
+Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -123,7 +119,6 @@ then : "Font files detected!"
 fi
 
 cd NTS
-%patch0 -p1 -b .pr35
 
 extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -138,6 +133,9 @@ extension = %{pecl_name}.so
 
 ; Documentation: http://php.net/imagick
 
+; Don't check builtime and runtime versions of ImageMagick
+imagick.skip_version_check=1
+
 ; Fixes a drawing bug with locales that use ',' as float separators.
 ;imagick.locale_fix=0
 
@@ -191,12 +189,20 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%post
-%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+# when pear installed alone, after us
+%triggerin -- %{?scl_prefix}php-pear
+if [ -x %{__pecl} ] ; then
+    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+fi
 
+# posttrans as pear can be installed after us
+%posttrans
+if [ -x %{__pecl} ] ; then
+    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+fi
 
 %postun
-if [ $1 -eq 0 ] ; then
+if [ $1 -eq 0 -a -x %{__pecl} ] ; then
     %{pecl_uninstall} %{pecl_name} >/dev/null || :
 fi
 
@@ -248,10 +254,13 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
+%{pecl_xmldir}/%{name}.xml
+
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
-%{pecl_xmldir}/%{name}.xml
+
 %if %{with_zts}
 %config(noreplace) %{php_ztsinidir}/%{ini_name}
 %{php_ztsextdir}/%{pecl_name}.so
@@ -261,12 +270,18 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc %{pecl_testdir}/%{pecl_name}
 %{php_incldir}/ext/%{pecl_name}
+
 %if %{with_zts}
 %{php_ztsincldir}/ext/%{pecl_name}
 %endif
 
 
 %changelog
+* Mon Mar 30 2015 Remi Collet <remi@fedoraproject.org> - 3.3.0-0.2.RC1
+- update to 3.3.0RC1
+- drop runtime dependency on pear, new scriptlets
+- set imagick.skip_version_check=1 in default configuration
+
 * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.10.RC1
 - Fedora 21 SCL mass rebuild