From a43a6790d5063ce8cca96c93f6a1aaa661cb8ab6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 16 Apr 2019 09:12:38 +0200
Subject: - 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 - open
 https://github.com/mkoppanen/imagick/issues/276 failed test on 32-bit

---
 php-pecl-imagick.spec | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

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

diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 6d7f187..f4fb294 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-imagick
 #
-# Copyright (c) 2008-2018 Remi Collet
+# Copyright (c) 2008-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -28,24 +28,26 @@
 %else
 %global ini_name    40-%{pecl_name}.ini
 %endif
+%global upstream_version 3.4.4
+%global upstream_prever  RC1
 
 # We don't really rely on upstream ABI
 %global imbuildver %(pkg-config --silence-errors --modversion ImageMagick 2>/dev/null || echo 65536)
 
 Summary:       Extension to create and modify images using ImageMagick
 Name:          %{?sub_prefix}php-pecl-imagick
-Version:       3.4.3
+Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 %if 0%{?gh_date}
 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:       15%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Release:       1%{?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
 URL:           http://pecl.php.net/package/imagick
 
-Patch0:        https://patch-diff.githubusercontent.com/raw/mkoppanen/imagick/pull/221.patch
+Source1:       https://raw.githubusercontent.com/mkoppanen/imagick/master/tests/functions.inc
 
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel > 5.4
@@ -138,7 +140,7 @@ mv NTS/package.xml .
 sed -e 's/@PACKAGE_VERSION@/%{version}dev/' -i NTS/php_imagick.h
 sed -e 's/3.3.0RC2/%{version}dev/' -i package.xml
 %else
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 %endif
 
 # don't install any font (and test using it)
@@ -157,11 +159,11 @@ then : "Font files detected!"
 fi
 
 cd NTS
-%patch0 -p1
+cp %{SOURCE1} tests/
 
 extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 cd ..
@@ -257,6 +259,10 @@ 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
@@ -304,6 +310,12 @@ cd ../ZTS
 
 
 %changelog
+* Tue Apr 15 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
+- open https://github.com/mkoppanen/imagick/issues/276 failed test on 32-bit
+
 * Fri Mar  8 2019 Remi Collet <remi@remirepo.net> - 3.4.3-15
 - F30 build
 
-- 
cgit