diff options
Diffstat (limited to 'php-pecl-imagick.spec')
| -rw-r--r-- | php-pecl-imagick.spec | 232 |
1 files changed, 104 insertions, 128 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index 288cba8..32467ee 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -1,15 +1,14 @@ # remirepo spec file for php-pecl-imagick # -# Copyright (c) 2008-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2008-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%bcond_with im6 -%bcond_with im7 %bcond_without tests +%bcond_with im6 # Distribution default IM version %if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 @@ -18,12 +17,11 @@ %global default 6 %endif -# 2 builds needed to get the full set -# --with im6 -# --with im7 - -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build +# NOTICE: 2 builds needed to get the full set +# All distro +# default (im7) +# On EL 8 and 9 +# --with im6 %if 0%{?scl:1} %scl_package php-pecl-imagick @@ -35,38 +33,26 @@ %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner imagick %global gh_project imagick -#global gh_date 20151204 %global pecl_name imagick +%global pie_vend imagick +%global pie_proj imagick %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else %global ini_name 40-%{pecl_name}.ini -%endif -%global upstream_version 3.7.0 -#global upstream_prever RC1 -%if 0%{?gh_date:1} -%global sources %{gh_project}-%{gh_commit} -%else +%global upstream_version 3.8.0 +#global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} -%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: 9.1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?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 @@ -74,84 +60,47 @@ 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} +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{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} - -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7 -# 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-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%endif -%endif - %description Imagick is a native php extension to create and modify images @@ -159,10 +108,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})}. @@ -173,11 +122,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} @@ -188,18 +146,13 @@ These are the files needed to compile programs using %{pecl_name} extension. %prep %setup -q -c -%if 0%{?gh_date} -mv NTS/package.xml . -sed -e 's/@PACKAGE_VERSION@/%{version}dev/' -i NTS/php_imagick.h -sed -e 's/3.3.0RC2/%{version}dev/' -i package.xml -%endif # don't install any font (and test using it) # don't install empty file (d41d8cd98f00b204e9800998ecf8427e) sed -e '/anonymous_pro_minus.ttf/d' \ -e '/015-imagickdrawsetresolution.phpt/d' \ -e '/OFL.txt/d' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml if grep '\.ttf' package.xml @@ -255,29 +208,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} @@ -286,7 +246,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 @@ -302,26 +262,6 @@ do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_docdir done -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# 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 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - %check cd %{sources} export REPORT_EXIT_STATUS=1 @@ -330,8 +270,10 @@ export REPORT_EXIT_STATUS=1 rm tests/229_Tutorial_fxAnalyzeImage_case1.phpt rm tests/244_Tutorial_psychedelicFontGif_basic.phpt # very long, and erratic results, sometime segfault on shutdown (EL-7/8) +# also see https://github.com/Imagick/imagick/issues/724 rm tests/073_Imagick_forwardFourierTransformImage_basic.phpt rm tests/086_Imagick_forwardFourierTransformImage_basic.phpt +rm tests/151_Imagick_subImageMatch_basic.phpt : simple module load test for NTS extension %{__php} --no-php-ini \ @@ -348,6 +290,17 @@ 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 + # Only if same version + if %{__php} -n -d extension=%{pecl_name} -r 'exit(phpversion("%{pecl_name}")==="%{upstream_version}%{?upstream_prever}" ? 0 : 1);' + 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 +fi %endif %if %{with_zts} @@ -360,7 +313,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %files -%{?_licensedir:%license %{sources}/LICENSE} +%license %{sources}/LICENSE %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -373,7 +326,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} @@ -383,6 +337,28 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog +* Fri Apr 11 2025 Remi Collet <remi@remirepo.net> - 3.8.0-1 +- update to 3.8.0 + +* Fri Mar 14 2025 Remi Collet <remi@remirepo.net> - 3.8.0~RC2-1 +- update to 3.8.0RC2 +- open https://github.com/Imagick/imagick/issues/723 test failure with PHP 5.x +- open https://github.com/Imagick/imagick/issues/724 erratic segfault in subImageMatch + +* 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 + * Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 3.7.0-9 - rebuild for PHP 8.3.0RC1 |