Update to 2.0.5RC1 (php 7, beta)

skip tests because GraphicMagick have issues with urw-fonts on Fedora 27 reported as open https://bugzilla.redhat.com/1530057

2 files changed, 29 insertions, 19 deletions

diff --git a/REFLECTION b/REFLECTION
index d0537e4..21a1647 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #62 gmagick version 2.0.4RC1 ] {
+Extension [ <persistent> extension #63 gmagick version 2.0.4RC1 ] {
 
   - Classes [5] {
     Class [ <internal:gmagick> final class GmagickException extends Exception implements Throwable ] {
@@ -364,9 +364,9 @@ Extension [ <persistent> extension #62 gmagick version 2.0.4RC1 ] {
         Constant [ integer DISPOSE_PREVIOUS ] { 3 }
         Constant [ integer QUANTUM_DEPTH ] { 16 }
         Constant [ integer QUANTUM ] { 131071 }
-        Constant [ string VERSION_TXT ] { 1.3.24 }
-        Constant [ integer VERSION_LIB ] { 1578240 }
-        Constant [ integer VERSION_NUM ] { 1003024 }
+        Constant [ string VERSION_TXT ] { 1.3.26 }
+        Constant [ integer VERSION_LIB ] { 1644032 }
+        Constant [ integer VERSION_NUM ] { 1003026 }
       }
 
       - Static properties [0] {
diff --git a/php-pecl-gmagick.spec b/php-pecl-gmagick.spec
index 60d4d6d..1a01121 100644
--- a/php-pecl-gmagick.spec
+++ b/php-pecl-gmagick.spec
@@ -1,6 +1,6 @@
 # spec file for php-pecl-gmagick
 #
-# Copyright (c) 2010-2017 Remi Collet
+# Copyright (c) 2010-2018 Remi Collet
 # Copyright (c) 2009-2010 Pavel Alexeev
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -17,16 +17,18 @@
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name   40-%{pecl_name}.ini
 
+%global upstream_version 2.0.5
+%global upstream_prever  RC1
+
 Summary:        Provides a wrapper to the GraphicsMagick library
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        2.0.4
-Release:        0.4.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        PHP
 Group:          Development/Libraries
 URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Source0:        http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-devel >= 7.0.1
 BuildRequires:  GraphicsMagick-devel >= 1.3.17
@@ -91,12 +93,12 @@ sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-mv %{pecl_name}-%{version}%{?prever} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 cd NTS
 
 extver=$(sed -n '/#define PHP_GMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_gmagick.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 extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 cd ..
@@ -128,8 +130,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # Install XML package description
@@ -149,10 +149,6 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %if 0%{?fedora} < 24
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
@@ -174,6 +170,16 @@ fi
 
 
 %check
+%if 0%{?fedora} >= 27
+# see https://bugzilla.redhat.com/1530057
+rm ?TS/tests/gmagick-006-annotateimage.phpt
+rm ?TS/tests/gmagickdraw-003-annotate.phpt
+rm ?TS/tests/gmagickdraw_038_setFontStretch_basic.phpt
+rm ?TS/tests/gmagickdraw_042_setTextAntialias_basic.phpt
+rm ?TS/tests/gmagickdraw_044_setTextUnderColor_basic.phpt
+rm ?TS/tests/gmagickdraw_045_setFontFamily_basic.phpt
+%endif
+
 : simple module load test for NTS extension
 cd NTS
 %{__php} --no-php-ini \
@@ -202,7 +208,6 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so"
 
 
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -217,6 +222,11 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so"
 
 
 %changelog
+* Mon Jan  1 2018 Remi Collet <remi@remirepo.net> - 2.0.5~RC1-1
+- Update to 2.0.5RC1 (php 7, beta)
+- skip tests because GraphicMagick have issues with urw-fonts on Fedora 27
+  reported as open https://bugzilla.redhat.com/1530057
+
 * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.4-0.4.RC1
 - rebuild for PHP 7.2.0beta1 new API