diff options
Diffstat (limited to 'php-pecl-imagick.spec')
| -rw-r--r-- | php-pecl-imagick.spec | 92 |
1 files changed, 27 insertions, 65 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index d71cc5b..2032161 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -7,21 +7,11 @@ # Please, preserve the changelog entries # +# Disable upstream test suite %bcond_without tests -%bcond_with im6 - -# Distribution default IM version -%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 -%global default 7 -%else -%global default 6 -%endif -# NOTICE: 2 builds needed to get the full set -# All distro -# default (im7) -# On EL 8 and 9 -# --with im6 +# Use ImageMagick legacy version +%bcond_with im6 %if 0%{?scl:1} %scl_package php-pecl-imagick @@ -45,20 +35,23 @@ %global forgeurl https://github.com/%{gh_vend}/%{gh_proj} %global tag %{upstream_version}%{?upstream_prever} +%global buildver %(pkg-config --silence-errors --modversion MagickWand 2>/dev/null || echo 65536) + +Name: %{?scl_prefix}php-pecl-imagick %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 License: PHP-3.01 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2.9%{?dist} +Release: 3%{?dist} %forgemeta URL: %{forgeurl} Source0: %{forgesource} +Patch0: 795.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -71,17 +64,9 @@ BuildRequires: ImageMagick7-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -%if %{with im6} +# Extension 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} = 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 # PECL Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} @@ -90,21 +75,10 @@ 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 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-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 +Obsoletes: %{?scl_prefix}php-pecl-imagick-im6 < %{version}-%{release} +Obsoletes: %{?scl_prefix}php-pecl-imagick-im7 < %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-imagick-im7 = %{version}-%{release} + %description Imagick is a native php extension to create and modify images @@ -112,37 +86,18 @@ using the ImageMagick API. Documentation: https://www.php.net/imagick -%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})}. +Package built using ImageMagick version %{buildver} +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})} %package devel -Summary: %{pecl_name} extension developer files (header) -Group: Development/Libraries +Summary: %{pecl_name} extension developer files (headers) Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?scl_prefix}php-devel%{?_isa} -%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} +Obsoletes: %{?scl_prefix}php-pecl-imagick-im6-devel < %{version}-%{release} +Obsoletes: %{?scl_prefix}php-pecl-imagick-im7-devel < %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-imagick-im7-devel = %{version}-%{release} %description devel These are the files needed to compile programs using %{pecl_name} extension. @@ -152,6 +107,8 @@ These are the files needed to compile programs using %{pecl_name} extension. %setup -q -c cd %{sources} +%patch -P0 -p1 + : bundled font rm tests/*.ttf rm tests/015-imagickdrawsetresolution.phpt @@ -327,6 +284,11 @@ exit $ret %changelog +* Fri Jul 17 2026 Remi Collet <remi@remirepo.net> - 3.8.1-3 +- fix build with PHP 8.6.0alpha2 using patch from + https://github.com/Imagick/imagick/pull/795 +- rename to php-pecl-imagick always using ImageMagick 7 + * Fri Mar 13 2026 Remi Collet <remi@remirepo.net> - 3.8.1-2 - drop pear/pecl dependency - sources from github |