From 5f8482e72c0bc0f9bf6f55fe646a888556d1c863 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 17 Apr 2019 09:28:47 +0200
Subject: - update to 3.4.4RC1 - drop patches merged upstream

---
 php-pecl-imagick.spec | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'php-pecl-imagick.spec')

diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 0646bce..8fc554c 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -21,7 +21,6 @@
 %global gh_project  imagick
 #global gh_date     20151204
 %global pecl_name   imagick
-#global prever      RC4
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %if "%{php_version}" < "5.6"
 %global ini_name    %{pecl_name}.ini
@@ -29,7 +28,7 @@
 %global ini_name    40-%{pecl_name}.ini
 %endif
 %global upstream_version 3.4.4
-%global upstream_prever  RC1
+%global upstream_prever  RC2
 
 # We don't really rely on upstream ABI
 %global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)
@@ -47,11 +46,6 @@ Source0:       http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstre
 License:       PHP
 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
 BuildRequires: %{?scl_prefix}php-pear
@@ -162,11 +156,6 @@ then : "Font files detected!"
 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
    : Error: Upstream version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
@@ -276,8 +265,7 @@ cd NTS
 : upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-%{__php} -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 : simple module load test for ZTS extension
@@ -312,6 +300,10 @@ cd ../ZTS
 
 
 %changelog
+* Wed Apr 17 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC2-1
+- update to 3.4.4RC1
+- drop patches merged upstream
+
 * Tue Apr 16 2019 Remi Collet <remi@remirepo.net> - 3.4.4~RC1-2
 - test build for upstream changes
 
-- 
cgit