diff options
| -rw-r--r-- | PHPINFO-im6 | 6 | ||||
| -rw-r--r-- | PHPINFO-im7 | 10 | ||||
| -rw-r--r-- | REFLECTION-im6 | 2 | ||||
| -rw-r--r-- | REFLECTION-im7 | 4 | ||||
| -rw-r--r-- | imagick-pr690.patch | 40 | ||||
| -rw-r--r-- | php-pecl-imagick.spec | 129 |
6 files changed, 132 insertions, 59 deletions
diff --git a/PHPINFO-im6 b/PHPINFO-im6 index 6a76c5f..03a9677 100644 --- a/PHPINFO-im6 +++ b/PHPINFO-im6 @@ -4,10 +4,10 @@ imagick imagick module => enabled imagick module version => 3.7.0 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel -Imagick compiled with ImageMagick version => ImageMagick 6.9.13-15 (Beta) Q16 x86_64 18443 https://legacy.imagemagick.org -Imagick using ImageMagick library version => ImageMagick 6.9.13-15 (Beta) Q16 x86_64 18443 https://legacy.imagemagick.org +Imagick compiled with ImageMagick version => ImageMagick 6.9.13-21 Q16 x86_64 18557 https://legacy.imagemagick.org +Imagick using ImageMagick library version => ImageMagick 6.9.13-21 Q16 x86_64 18557 https://legacy.imagemagick.org ImageMagick copyright => (C) 1999 ImageMagick Studio LLC -ImageMagick release date => 2024-07-27 +ImageMagick release date => 2024-12-22 ImageMagick number of supported formats: => 250 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, FLV, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, 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, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPEG, 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 59003c4..ee5a245 100644 --- a/PHPINFO-im7 +++ b/PHPINFO-im7 @@ -4,12 +4,12 @@ imagick imagick module => enabled imagick module version => 3.7.0 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel -Imagick compiled with ImageMagick version => ImageMagick 7.1.1-37 Q16-HDRI x86_64 22381 https://imagemagick.org -Imagick using ImageMagick library version => ImageMagick 7.1.1-37 Q16-HDRI x86_64 22381 https://imagemagick.org +Imagick compiled with ImageMagick version => ImageMagick 7.1.1-43 Q16-HDRI x86_64 22550 https://imagemagick.org +Imagick using ImageMagick library version => ImageMagick 7.1.1-43 Q16-HDRI x86_64 22550 https://imagemagick.org ImageMagick copyright => (C) 1999 ImageMagick Studio LLC -ImageMagick release date => 2024-08-25 -ImageMagick number of supported formats: => 272 -ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVI, AVIF, AVS, BAYER, BAYERA, 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, FFF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, FTXT, 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, JXL, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MDC, MEF, MIFF, MKV, MNG, MONO, MOS, MOV, MP4, MPC, MPEG, MPG, MPO, 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, QOI, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, RWL, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, SRW, STEGANO, STI, STRIMG, 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 +ImageMagick release date => 2024-12-22 +ImageMagick number of supported formats: => 273 +ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVCI, AVI, AVIF, AVS, BAYER, BAYERA, 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, FFF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, FTXT, 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, JXL, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MDC, MEF, MIFF, MKV, MNG, MONO, MOS, MOV, MP4, MPC, MPEG, MPG, MPO, 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, QOI, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, RWL, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, SRW, STEGANO, STI, STRIMG, 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 Directive => Local Value => Master Value imagick.locale_fix => 0 => 0 diff --git a/REFLECTION-im6 b/REFLECTION-im6 index 14a9072..e8f99d1 100644 --- a/REFLECTION-im6 +++ b/REFLECTION-im6 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #53 imagick version 3.7.0 ] { +Extension [ <persistent> extension #18 imagick version 3.7.0 ] { - Dependencies { Dependency [ gmagick (Conflicts) ] diff --git a/REFLECTION-im7 b/REFLECTION-im7 index d4a327b..6da5139 100644 --- a/REFLECTION-im7 +++ b/REFLECTION-im7 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #78 imagick version 3.7.0 ] { +Extension [ <persistent> extension #82 imagick version 3.7.0 ] { - Dependencies { Dependency [ gmagick (Conflicts) ] @@ -616,7 +616,7 @@ Extension [ <persistent> extension #78 imagick version 3.7.0 ] { Constant [ public int FILTER_WELCH ] { 17 } Constant [ public int FILTER_PARZEN ] { 18 } Constant [ public int FILTER_LAGRANGE ] { 21 } - Constant [ public int FILTER_SENTINEL ] { 32 } + Constant [ public int FILTER_SENTINEL ] { 34 } Constant [ public int FILTER_BOHMAN ] { 19 } Constant [ public int FILTER_BARTLETT ] { 20 } Constant [ public int FILTER_JINC ] { 13 } diff --git a/imagick-pr690.patch b/imagick-pr690.patch new file mode 100644 index 0000000..189e745 --- /dev/null +++ b/imagick-pr690.patch @@ -0,0 +1,40 @@ +From 65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz> +Date: Wed, 25 Sep 2024 10:56:28 +0200 +Subject: [PATCH] Fix removed "php_strtolower" for PHP 8.4 + +--- + imagick.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/imagick.c b/imagick.c +index 1b765389..ebab7ae7 100644 +--- a/imagick.c ++++ b/imagick.c +@@ -610,7 +610,7 @@ static zval *php_imagick_read_property(zend_object *object, zend_string *member, + if (format) { + retval = rv; + ZVAL_STRING(retval, format); +- php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); ++ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + IMAGICK_FREE_MAGICK_MEMORY(format); + } else { + retval = rv; +@@ -683,7 +683,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, voi + if (format) { + retval = rv; + ZVAL_STRING(retval, format); +- php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); ++ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + IMAGICK_FREE_MAGICK_MEMORY(format); + } else { + retval = rv; +@@ -766,7 +766,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, con + + if (format) { + ZVAL_STRING(retval, format, 1); +- php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); ++ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + IMAGICK_FREE_MAGICK_MEMORY(format); + } else { + ZVAL_STRING(retval, "", 1); diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index 5a8b92f..6de4afb 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -1,28 +1,27 @@ # remirepo spec file for php-pecl-imagick # -# Copyright (c) 2008-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2008-2024 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests +%bcond_with im6 # Distribution default IM version %if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 %global default 7 -%bcond_with im6 -%bcond_with im7 %else %global default 6 -%bcond_with im6 -%bcond_with im7 %endif -# 2 builds needed to get the full set -# --with im6 -# --with im7 +# NOTICE: 2 builds needed to get the full set +# All distro +# default (im7) +# On Fedora <= 39 and EL <= 9 +# --with im6 # we don't want -z defs linker flag %undefine _strict_symbol_defs_build @@ -50,72 +49,70 @@ %endif %global _configure ../%{sources}/configure -%if %{with im7} -Summary: Extension to create and modify images using ImageMagick 7 -Name: %{?scl_prefix}php-pecl-imagick-im7 -%else +%if %{with im6} Summary: Extension to create and modify images using ImageMagick 6 Name: %{?scl_prefix}php-pecl-imagick-im6 +%else +Summary: Extension to create and modify images using ImageMagick 7 +Name: %{?scl_prefix}php-pecl-imagick-im7 %endif Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} %if 0%{?gh_date} Release: 0.11.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 10.9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 13%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz %endif License: PHP-3.01 URL: https://pecl.php.net/package/imagick Patch0: %{pecl_name}-tests.patch +Patch1: %{pecl_name}-pr690.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear -BuildRequires: pcre-devel -%if %{with im7} -BuildRequires: ImageMagick7-devel -%else %if %{with im6} BuildRequires: ImageMagick6-devel %else -BuildRequires: ImageMagick-devel -%endif +BuildRequires: ImageMagick7-devel %endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -%if %{with im7} -Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version}%{?prever} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version}%{?prever} +%if %{with im6} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl-imagick = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-imagick%{?_isa} = %{version}-%{release} %else -Provides: %{?scl_prefix}php-%{pecl_name} = %{version}%{?prever} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}%{?prever} +Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version} +Provides: %{?scl_prefix}php-pecl-imagick = 1:%{version}-%{release} +Provides: %{?scl_prefix}php-pecl-imagick%{?_isa} = 1:%{version}-%{release} %endif -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}%{?prever} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Conflicts: %{?scl_prefix}php-pecl-gmagick -%if %{with im7} -Conflicts: %{?scl_prefix}php-pecl-imagick-im6 <= %{version}-%{release} -%if %{default} == 7 +%if %{with im6} +Conflicts: %{?scl_prefix}php-pecl-imagick-im7 <= %{version}-%{release} +%if %{default} == 6 Obsoletes: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release} %else Conflicts: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release} %endif %else -Conflicts: %{?scl_prefix}php-pecl-imagick-im7 <= %{version}-%{release} -%if %{default} == 6 +Conflicts: %{?scl_prefix}php-pecl-imagick-im6 <= %{version}-%{release} +%if %{default} == 7 Obsoletes: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release} %else Conflicts: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release} %endif %endif -Provides: %{?scl_prefix}php-pecl-imagick = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-imagick%{?_isa} = %{version}-%{release} %description Imagick is a native php extension to create and modify images @@ -123,10 +120,10 @@ using the ImageMagick API. Documentation: https://www.php.net/imagick -%if %{with im7} -Package built using ImageMagick version 7 -%else +%if %{with im6} Package built using ImageMagick version 6 +%else +Package built using ImageMagick version 7 %endif Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. @@ -137,11 +134,20 @@ Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?scl_prefix}php-devel%{?_isa} -%if %{with im7} -Conflicts: %{?scl_prefix}php-pecl-imagick-im6-devel -%else +%if %{with im6} Conflicts: %{?scl_prefix}php-pecl-imagick-im7-devel +%if %{default} == 6 +Obsoletes: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release} +%else +Conflicts: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release} +%endif +%else +Conflicts: %{?scl_prefix}php-pecl-imagick-im6-devel +%if %{default} == 7 Obsoletes: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release} +%else +Conflicts: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release} +%endif %endif Provides: %{?scl_prefix}php-pecl-imagick-devel = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-imagick-devel%{?_isa} = %{version}-%{release} @@ -173,6 +179,7 @@ fi cd %{sources} %patch -P0 -p1 +%patch -P1 -p1 : Avoid arginfo to be regenerated rm *.stub.php @@ -221,29 +228,36 @@ mkdir ZTS cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL : Standard NTS build cd ../NTS %configure --with-imagick=%{_root_prefix} --with-php-config=%{__phpconfig} -make %{?_smp_mflags} +%make_build -: Dump REFLECTION +: Dump REFLECTION and PHPINFO +%{__php} --no-php-ini \ + --define extension=modules/%{pecl_name}.so \ + --define imagick.skip_version_check=1 \ + --re imagick >../REFLECTION %{__php} --no-php-ini \ --define extension=modules/%{pecl_name}.so \ - --re imagick >REFLECTION + --define imagick.skip_version_check=1 \ + --ri imagick >../PHPINFO %if %{with_zts} : ZTS build cd ../ZTS %configure --with-imagick=%{_root_prefix} --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} +%make_build %endif %install %{?dtsenable} -make install INSTALL_ROOT=%{buildroot} -C NTS +%make_install -C NTS # Drop in the bit of configuration install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -252,7 +266,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -p -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make install INSTALL_ROOT=%{buildroot} -C ZTS +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -294,6 +308,13 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %else %{__php} -n run-tests.php -q --show-diff %endif + +if [ -f %{php_extdir}/%{pecl_name}.so ]; then +: upstream test suite for extension built with previous version +%{__php} --ri imagick +TEST_PHP_ARGS="-n -d extension=%{pecl_name}" \ +%{__php} -n run-tests.php -q --show-diff %{?_smp_mflags} +fi %endif %if %{with_zts} @@ -319,7 +340,8 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %endif %files devel -%doc NTS/REFLECTION +%doc REFLECTION +%doc PHPINFO %doc %{pecl_testdir}/%{pecl_name} %{php_incldir}/ext/%{pecl_name} @@ -329,6 +351,17 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog +* Mon Dec 23 2024 Remi Collet <remi@remirepo.net> - 3.7.0-13 +- re-license spec file to CECILL-2.1 +- im7 by default, change using --with im6 build option + +* Thu Nov 21 2024 Remi Collet <remi@remirepo.net> - 3.7.0-12 +- drop unneeded build dependency + +* Fri Sep 27 2024 Remi Collet <remi@remirepo.net> - 3.7.0-11 +- add patch for PHP 8.4 from + https://github.com/Imagick/imagick/pull/690 + * Mon Feb 12 2024 Remi Collet <remi@remirepo.net> - 3.7.0-10 - add upstream patch for test suite with recent IM versions |