From 8937dc7e15e117b8390639b129f94cf33f334957 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Oct 2019 08:25:19 +0100 Subject: - add patch for latest ImageMagick from https://github.com/Imagick/imagick/pull/302 --- php-pecl-imagick.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'php-pecl-imagick.spec') diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index ba141b5..79297a9 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -40,7 +40,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 0.8.%{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: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz %endif License: PHP @@ -49,6 +49,7 @@ URL: http://pecl.php.net/package/imagick Patch0: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/290.patch Patch1: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/291.patch Patch2: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/296.patch +Patch3: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/302.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 5.4 @@ -169,6 +170,7 @@ cd NTS %if "%{php_version}" > "7.4" %patch2 -p1 %endif +%patch3 -p1 extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -315,6 +317,10 @@ cd ../ZTS %changelog +* Tue Oct 29 2019 Remi Collet - 3.4.4-7 +- add patch for latest ImageMagick from + https://github.com/Imagick/imagick/pull/302 + * Tue Sep 03 2019 Remi Collet - 3.4.4-6 - rebuild for 7.4.0RC1 -- cgit