summaryrefslogtreecommitdiffstats
path: root/php-pecl-imagick.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-09-04 11:25:42 +0200
committerRemi Collet <remi@remirepo.net>2020-09-04 11:25:42 +0200
commit94abfd85fee63633104a6b4410a050ff7637b53a (patch)
tree2dff96d917d381baf78bcd1763b15d1fd862967b /php-pecl-imagick.spec
parent9ad7f9cc2df761bd2976880f81aad344849e5aa5 (diff)
add patches for PHP 8 from upstream andHEADmaster
https://github.com/Imagick/imagick/pull/346 SPL always there https://github.com/Imagick/imagick/pull/347 thread limit per request https://github.com/Imagick/imagick/pull/348 single thread
Diffstat (limited to 'php-pecl-imagick.spec')
-rw-r--r--php-pecl-imagick.spec28
1 files changed, 16 insertions, 12 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index a299dec..908b1d6 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -37,16 +37,16 @@ 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: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 12%{?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
URL: https://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
+Patch0: %{pecl_name}-php8.patch
+Patch1: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/346.patch
+Patch2: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/347.patch
+Patch3: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/348.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 5.4
@@ -73,7 +73,7 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea
Conflicts: %{?scl_prefix}php-pecl-gmagick
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
Obsoletes: php53-pecl-%{pecl_name} <= %{version}
Obsoletes: php53u-pecl-%{pecl_name} <= %{version}
@@ -160,12 +160,10 @@ then : "Font files detected!"
fi
cd NTS
-%patch0 -p1
-%patch1 -p1
-%if "%{php_version}" > "7.4"
-%patch2 -p1
-%endif
-%patch3 -p1
+%patch0 -p1 -b .up
+%patch1 -p1 -b .pr346
+%patch2 -p1 -b .pr347
+%patch3 -p1 -b .pr348
extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -312,6 +310,12 @@ cd ../ZTS
%changelog
+* Fri Sep 4 2020 Remi Collet <remi@remirepo.net> - 3.4.4-12
+- add patches for PHP 8 from upstream and
+ https://github.com/Imagick/imagick/pull/346 - SPL always there
+ https://github.com/Imagick/imagick/pull/347 - thread limit per request
+ https://github.com/Imagick/imagick/pull/348 - single thread
+
* Tue Apr 21 2020 Remi Collet <remi@remirepo.net> - 3.4.4-11
- build against ImageMagick on EL-7