From dfd86761c1891a08c2fcc8ea8a167f7285fc8ed1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 8 Mar 2015 10:01:08 +0100
Subject: PHP 5.5.23RC1 (as SCL)

---
 php-odbc.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 php.spec       | 12 +++++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 php-odbc.patch

diff --git a/php-odbc.patch b/php-odbc.patch
new file mode 100644
index 0000000..12bff99
--- /dev/null
+++ b/php-odbc.patch
@@ -0,0 +1,40 @@
+From 89f86119d612d539a4ec189aff4d3c077cb608a1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Sun, 8 Mar 2015 07:34:51 +0100
+Subject: [PATCH] Fix odbc build as shared
+
+Broken since a41aa46759d20e23af92df00b917ca66c6102412
+---
+ ext/odbc/config.m4 | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
+index f79c461..9555efd 100644
+--- a/ext/odbc/config.m4
++++ b/ext/odbc/config.m4
+@@ -99,6 +99,11 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[
+ dnl
+ dnl configure options
+ dnl
++
++PHP_ARG_WITH(odbcver,,
++[  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0300.
++                             Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
++
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
+@@ -490,10 +495,6 @@ PHP_ARG_WITH(dbmaker,,
+   fi
+ fi
+ 
+-PHP_ARG_WITH(odbcver,,
+-[  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+-                             Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+-
+ if test "no" != "$PHP_ODBCVER"; then
+   if test "$PHP_ODBCVER" != "0"; then
+     AC_DEFINE_UNQUOTED(ODBCVER, $PHP_ODBCVER, [ The highest supported ODBC version ])
+-- 
+2.1.4
+
diff --git a/php.spec b/php.spec
index 4d57463..6eb17af 100644
--- a/php.spec
+++ b/php.spec
@@ -127,12 +127,12 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver RC1
+%global rcver RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
-Version: 5.5.22
-Release: 1%{?dist}
+Version: 5.5.23
+Release: 0.1.RC1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -183,6 +183,7 @@ Patch47: php-5.4.9-phpinfo.patch
 Patch91: php-5.3.7-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: php-odbc.patch
 
 # Security fixes (200+)
 
@@ -855,6 +856,8 @@ support for using the enchant library to PHP.
 %patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
 
+%patch100 -p1 -b .obbc
+
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
@@ -1732,6 +1735,9 @@ fi
 
 
 %changelog
+* Sun Mar  8 2015 Remi Collet <remi@fedoraproject.org> 5.5.23-0.1.RC1
+- update to 5.5.23RC1
+
 * Wed Feb 18 2015 Remi Collet <remi@fedoraproject.org> 5.5.22-1
 - Update to 5.5.22
   http://www.php.net/releases/5_5_22.php
-- 
cgit