From 1521c5c768aee3a14e7375d70331da360d86d32b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 18 Feb 2019 13:44:54 +0100
Subject: pdo_oci: backport PDOStatement::getColumnMeta from 7.4 rebuild using
 libicu62

---
 php.spec | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 2e39435..94ffc2c 100644
--- a/php.spec
+++ b/php.spec
@@ -135,7 +135,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -185,6 +185,8 @@ Patch46: php-7.2.4-fixheader.patch
 Patch47: php-5.6.3-phpinfo.patch
 # getallheaders for FPM backported from 7.3
 Patch48: php-7.2.8-getallheaders.patch
+# backport PDOStatement::getColumnMeta from 7.4
+Patch49: php-7.2.16-pdooci.patch
 
 # RC Patch
 Patch91: php-7.2.0-oci8conf.patch
@@ -415,6 +417,11 @@ Requires: libtool
 %if %{with_libpcre}
 Requires: pcre-devel%{?_isa} >= 8.20
 %endif
+%if 0%{?rhel} == 6
+Requires: libicu-last-devel%{?_isa}
+%else
+Requires: libicu-devel%{?_isa} > 62
+%endif
 
 %description devel
 The %{?scl_prefix}php-devel package contains the files needed for building PHP
@@ -832,8 +839,11 @@ Group: System Environment/Libraries
 # All files licensed under PHP version 3.01
 License: PHP
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-# Upstream requires 4.0, we require 50 to ensure use of libicu-last
-BuildRequires: libicu-devel >= 50
+%if 0%{?rhel} == 6
+BuildRequires: libicu-last-devel
+%else
+BuildRequires: libicu-devel > 62
+%endif
 
 %description intl
 The %{?scl_prefix}php-intl package contains a dynamic shared object that will add
@@ -929,6 +939,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
 %patch48 -p1 -b .getallheaders
+%patch49 -p1 -b .pdooci
 
 %patch91 -p1 -b .remi-oci8
 
@@ -1881,6 +1892,10 @@ fi
 
 
 %changelog
+* Mon Feb 18 2019 Remi Collet <remi@remirepo.net> - 7.2.15-2
+- pdo_oci: backport PDOStatement::getColumnMeta from 7.4
+- rebuild using libicu62
+
 * Tue Feb  5 2019 Remi Collet <remi@remirepo.net> - 7.2.15-1
 - Update to 7.2.15 - http://www.php.net/releases/7_2_15.php
 
-- 
cgit