summaryrefslogtreecommitdiffstats
path: root/php-pecl-imagick.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-imagick.spec')
-rw-r--r--php-pecl-imagick.spec15
1 files changed, 9 insertions, 6 deletions
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index bafec54..0646bce 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -41,7 +41,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 0.5.%{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: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?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,8 @@ URL: http://pecl.php.net/package/imagick
Source1: https://raw.githubusercontent.com/mkoppanen/imagick/master/tests/functions.inc
Patch0: https://github.com/mkoppanen/imagick/pull/278.patch
+Patch1: https://github.com/mkoppanen/imagick/commit/1c0de8054c2feb3d7f4d9ee7e303b362adc68f1c.patch
+Patch2: https://github.com/mkoppanen/imagick/commit/63e4eab9cf47d0bf8ff25a2d0414389580d80e23.patch
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 5.4
@@ -162,6 +164,8 @@ fi
cd NTS
cp %{SOURCE1} tests/
%patch0 -p1 -b .pr278
+%patch1 -p1 -b .up
+%patch2 -p1 -b .up
extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -261,10 +265,6 @@ fi
export REPORT_EXIT_STATUS=1
# very long, and erratic results, sometime timeout
rm ?TS/tests/229_Tutorial_fxAnalyzeImage_case1.phpt
-%if %{__isa_bits} < 64
-rm ?TS/tests/014-setresourcelimit.phpt
-rm ?TS/tests/280_imagickkernel_exception_invalid_origin.phpt
-%endif
: simple module load test for NTS extension
cd NTS
@@ -312,7 +312,10 @@ cd ../ZTS
%changelog
-* Tue Apr 15 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC1-1
+* Tue Apr 16 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC1-2
+- test build for upstream changes
+
+* Tue Apr 16 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC1-1
- update to 3.4.4RC1
- open https://github.com/mkoppanen/imagick/pull/274 missing file
- open https://github.com/mkoppanen/imagick/issues/275 bad stabililty