update to 3.6.0

5 files changed, 18 insertions, 15 deletions

diff --git a/PHPINFO-im6 b/PHPINFO-im6
index edfac44..f1d1679 100644
--- a/PHPINFO-im6
+++ b/PHPINFO-im6
@@ -2,12 +2,12 @@
 imagick
 
 imagick module => enabled
-imagick module version => 3.6.0RC2
+imagick module version => 3.6.0
 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
-Imagick compiled with ImageMagick version => ImageMagick 6.9.12-28 Q16 x86_64 2021-10-29 https://imagemagick.org
-Imagick using ImageMagick library version => ImageMagick 6.9.12-28 Q16 x86_64 2021-10-29 https://imagemagick.org
+Imagick compiled with ImageMagick version => ImageMagick 6.9.12-29 Q16 x86_64 2021-11-14 https://imagemagick.org
+Imagick using ImageMagick library version => ImageMagick 6.9.12-29 Q16 x86_64 2021-11-14 https://imagemagick.org
 ImageMagick copyright => (C) 1999-2021 ImageMagick Studio LLC
-ImageMagick release date => 2021-10-29
+ImageMagick release date => 2021-11-14
 ImageMagick number of supported formats:  => 247
 ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUR, CUT, DATA, DCM, DCR, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FAX, FILE, FITS, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, HALD, HDR, HEIC, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PREVIEW, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGBA, RGBO, RGF, RLA, RLE, RMF, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIDEO, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YCbCr, YCbCrA, YUV
 
diff --git a/PHPINFO-im7 b/PHPINFO-im7
index 8abc269..0b4dbe1 100644
--- a/PHPINFO-im7
+++ b/PHPINFO-im7
@@ -2,12 +2,12 @@
 imagick
 
 imagick module => enabled
-imagick module version => 3.6.0RC2
+imagick module version => 3.6.0
 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
-Imagick compiled with ImageMagick version => ImageMagick 7.1.0-13 Q16-HDRI x86_64 2021-10-29 https://imagemagick.org
-Imagick using ImageMagick library version => ImageMagick 7.1.0-13 Q16-HDRI x86_64 2021-10-29 https://imagemagick.org
+Imagick compiled with ImageMagick version => ImageMagick 7.1.0-14 Q16-HDRI x86_64 2021-11-14 https://imagemagick.org
+Imagick using ImageMagick library version => ImageMagick 7.1.0-14 Q16-HDRI x86_64 2021-11-14 https://imagemagick.org
 ImageMagick copyright => (C) 1999-2021 ImageMagick Studio LLC
-ImageMagick release date => 2021-10-29
+ImageMagick release date => 2021-11-14
 ImageMagick number of supported formats:  => 259
 ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUBE, CUR, CUT, DATA, DCM, DCR, DCRAW, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FARBFELD, FAX, FF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPEG, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORA, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PHM, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TM2, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YAML, YCbCr, YCbCrA, YUV
 
diff --git a/REFLECTION-im6 b/REFLECTION-im6
index 3773eea..6f001b3 100644
--- a/REFLECTION-im6
+++ b/REFLECTION-im6
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #97 imagick version 3.6.0RC2 ] {
+Extension [ <persistent> extension #97 imagick version 3.6.0 ] {
 
   - Dependencies {
     Dependency [ gmagick (Conflicts) ]
@@ -327,7 +327,7 @@ Extension [ <persistent> extension #97 imagick version 3.6.0RC2 ] {
         Constant [ public int COLOR_ALPHA ] { 19 }
         Constant [ public int COLOR_FUZZ ] { 20 }
         Constant [ public int IMAGICK_EXTNUM ] { 30600 }
-        Constant [ public string IMAGICK_EXTVER ] { 3.6.0RC2 }
+        Constant [ public string IMAGICK_EXTVER ] { 3.6.0 }
         Constant [ public int QUANTUM_RANGE ] { 65535 }
         Constant [ public int USE_ZEND_MM ] { 0 }
         Constant [ public int COMPOSITE_DEFAULT ] { 40 }
diff --git a/REFLECTION-im7 b/REFLECTION-im7
index 4b89c47..6cbce9f 100644
--- a/REFLECTION-im7
+++ b/REFLECTION-im7
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #79 imagick version 3.6.0RC2 ] {
+Extension [ <persistent> extension #79 imagick version 3.6.0 ] {
 
   - Dependencies {
     Dependency [ gmagick (Conflicts) ]
@@ -326,7 +326,7 @@ Extension [ <persistent> extension #79 imagick version 3.6.0RC2 ] {
         Constant [ public int COLOR_ALPHA ] { 18 }
         Constant [ public int COLOR_FUZZ ] { 19 }
         Constant [ public int IMAGICK_EXTNUM ] { 30600 }
-        Constant [ public string IMAGICK_EXTVER ] { 3.6.0RC2 }
+        Constant [ public string IMAGICK_EXTVER ] { 3.6.0 }
         Constant [ public int QUANTUM_RANGE ] { 65535 }
         Constant [ public int USE_ZEND_MM ] { 0 }
         Constant [ public int COMPOSITE_DEFAULT ] { 54 }
@@ -916,7 +916,7 @@ Extension [ <persistent> extension #79 imagick version 3.6.0RC2 ] {
         Constant [ public int DIRECTION_RIGHT_TO_LEFT ] { 1 }
         Constant [ public int NORMALIZE_KERNEL_NONE ] { 0 }
         Constant [ public int NORMALIZE_KERNEL_VALUE ] { 8192 }
-        Constant [ public int NORMALIZE_KERNEL_CORRELATE ] { 65536 }
+        Constant [ public int NORMALIZE_KERNEL_CORRELATE ] { 131072 }
         Constant [ public int NORMALIZE_KERNEL_PERCENT ] { 4096 }
         Constant [ public int PIXELMASK_READ ] { 1 }
         Constant [ public int PIXELMASK_WRITE ] { 2 }
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 9cf9a6c..21fdfdd 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -37,7 +37,7 @@
 %global ini_name    40-%{pecl_name}.ini
 %endif
 %global upstream_version 3.6.0
-%global upstream_prever  RC2
+#global upstream_prever  RC2
 
 %if %{with im7}
 Summary:       Extension to create and modify images using ImageMagick 7
@@ -68,7 +68,7 @@ BuildRequires: ImageMagick7-devel
 %if %{with im6}
 BuildRequires: ImageMagick6-devel
 %else
-BuildRequires: ImageMagick-devel > 1:6
+BuildRequires: ImageMagick-devel
 %endif
 %endif
 
@@ -363,6 +363,9 @@ cd ../ZTS
 
 
 %changelog
+* Wed Nov 17 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+
 * Fri Nov 12 2021 Remi Collet <remi@remirepo.net> - 3.6.0~RC2-1
 - update to 3.6.0RC2