From ad49acd3667a4c979ff5bf86e70e78cd7eff2c56 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 22 Jun 2018 12:21:20 +0200
Subject: open https://git.osgeo.org/gitea/geos/php-geos/issues/20 fix -Wformat
 issues + test for PHP 7.3

---
 php-geos.spec | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/php-geos.spec b/php-geos.spec
index 7b33879..7837d9f 100644
--- a/php-geos.spec
+++ b/php-geos.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-geos
 #
-# Copyright (c) 2016-2017 Remi Collet
+# Copyright (c) 2016-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -24,7 +24,7 @@
 
 Name:           %{?sub_prefix}php-%{pecl_name}
 Version:        1.0.0
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 Summary:        PHP module for GEOS
 
@@ -34,6 +34,11 @@ License:        LGPLv2+ and MIT
 URL:            http://trac.osgeo.org/geos
 Source0:        https://git.osgeo.org/gogs/geos/php-geos/archive/%{version}%{?prever}.tar.gz
 
+# https://git.osgeo.org/gitea/geos/php-geos/issues/20
+Patch0:         0001-fix-test-for-7.3-int-vs-integer.patch
+Patch1:         0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
+
+BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel
 BuildRequires:  %{?scl_prefix}php-pear
 # Test failures with 3.3 (EL-6)
@@ -54,12 +59,6 @@ Provides:       %{?scl_prefix}geos-php%{?_isa} = 1:%{version}-%{release}
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-Obsoletes:     php54-%{pecl_name}       <= %{version}
-Obsoletes:     php54w-%{pecl_name}      <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-%{pecl_name}      <= %{version}
-Obsoletes:     php55w-%{pecl_name}      <= %{version}
-%endif
 %if "%{php_version}" > "5.6"
 Obsoletes:     php56u-%{pecl_name}      <= %{version}
 Obsoletes:     php56w-%{pecl_name}      <= %{version}
@@ -92,6 +91,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 mv %{pkg_name} NTS
 
 cd NTS
+%patch0 -p1 -b .test
+%patch1 -p1 -b .wformat
+
 sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h
 
 # Check extension version
@@ -115,6 +117,8 @@ cp -pr NTS ZTS
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure --with-php-config=%{_bindir}/php-config
@@ -129,6 +133,8 @@ make %{?_smp_mflags}
 
 
 %install
+%{?dtsenable}
+
 make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install configuration
@@ -191,6 +197,10 @@ exit $ret
 
 
 %changelog
+* Fri Jun 22 2018 Remi Collet <remi@remirepo.net> - 1.0.0-9
+- open https://git.osgeo.org/gitea/geos/php-geos/issues/20
+  fix -Wformat issues + test for PHP 7.3
+
 * Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 1.0.0-3
 - rebuild for PHP 7.2.0beta1 new API
 
-- 
cgit