summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-02-12 16:10:17 +0100
committerRemi Collet <remi@remirepo.net>2021-02-12 16:10:17 +0100
commite1dbdc82ca695cf27a1013930a89628d6d8b95fc (patch)
treece24ad8b6b681b5ef99444434abd8408f1f1eec0
parent4b911b7f75ce8bdaef713d4062a5e9a300637508 (diff)
Update to 2.0.6RC1
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-gmagick.spec19
3 files changed, 10 insertions, 13 deletions
diff --git a/PHPINFO b/PHPINFO
index fec3df1..85636b9 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
gmagick
gmagick module => enabled
-gmagick version => 2.0.5RC1
+gmagick version => 2.0.6RC1
GraphicsMagick version => GraphicsMagick 1.3.36 20201226 Q16 http://www.GraphicsMagick.org/
Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index eb1de29..5353a46 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #92 gmagick version 2.0.5RC1 ] {
+Extension [ <persistent> extension #90 gmagick version 2.0.6RC1 ] {
- INI {
Entry [ gmagick.shutdown_sleep_count <ALL> ]
diff --git a/php-pecl-gmagick.spec b/php-pecl-gmagick.spec
index 9b95f26..5ce169f 100644
--- a/php-pecl-gmagick.spec
+++ b/php-pecl-gmagick.spec
@@ -19,20 +19,17 @@
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global ini_name 40-%{pecl_name}.ini
-%global upstream_version 2.0.5
+%global upstream_version 2.0.6
%global upstream_prever RC1
Summary: Provides a wrapper to the GraphicsMagick library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-Source1: https://raw.githubusercontent.com/rlerdorf/gmagick/master/tests/skipif.inc
-Patch0: https://patch-diff.githubusercontent.com/raw/vitoc/gmagick/pull/50.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-pear
@@ -78,17 +75,14 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -qc
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
%{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
-i package.xml
-mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
cd NTS
-%patch0 -p1 -b .pr50
-cp %{SOURCE1} tests/skipif.inc
-
extver=$(sed -n '/#define PHP_GMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_gmagick.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
: Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
@@ -172,9 +166,9 @@ export OMP_NUM_THREADS=1
rm ?TS/tests/gmagick-056-set_getsamplingfactors.phpt
-%if 0%{?fedora} == 31 || 0%{?rhel} == 8
+%if 0%{?fedora} == 31
# see https://bugzilla.redhat.com/1530057 (F31 with 1.3.34)
-# see https://bugzilla.redhat.com/1919997 (EPEL-8)
+rm ?TS/tests/bug71626.phpt
rm ?TS/tests/gmagick-006-annotateimage.phpt
rm ?TS/tests/gmagickdraw-003-annotate.phpt
rm ?TS/tests/gmagickdraw_038_setFontStretch_basic.phpt
@@ -229,6 +223,9 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so"
%changelog
+* Fri Feb 12 2021 Remi Collet <remi@remirepo.net> - 2.0.6~RC1-1
+- Update to 2.0.6RC1
+
* Wed Jan 27 2021 Remi Collet <remi@remirepo.net> - 2.0.5~RC1-9
- refresh PHP 8 patch