From 33f6eb3b68efcc86d7d023e0e541459c7dd1c1e7 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 4 Sep 2015 13:58:41 +0200
Subject: PHP 7.0.0RC2

---
 php.spec | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 8bb1aa7..b655661 100644
--- a/php.spec
+++ b/php.spec
@@ -27,7 +27,7 @@
 %global pdover      20150127
 # Extension version
 %global opcachever  7.0.6-dev
-%global oci8ver     2.0.9
+%global oci8ver     2.1.0
 
 # Adds -z now to the linker flags
 %global _hardened_build 1
@@ -70,10 +70,7 @@
 %global mysql_config %{_root_libdir}/mysql/mysql_config
 
 # Optional components; pass "--with mssql" etc to rpmbuild.
-#global with_oci8      %{?_with_oci8:1}%{!?_with_oci8:0}
-### TODO : create specific 20-oci8.ini configuration file ###
-%global with_oci8      0
-
+%global with_oci8      %{?_with_oci8:1}%{!?_with_oci8:0}
 %global with_imap      1
 %global with_interbase 1
 %global with_mcrypt    1
@@ -133,8 +130,8 @@
 #global gh_date      20150623
 #global gh_owner     php
 #global gh_project   php-src
-%global rcver        RC1
-%global rpmrel       14
+%global rcver        RC2
+%global rpmrel       15
 
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -169,8 +166,9 @@ Source9: php.modconf
 Source10: php.conf2
 Source11: php-fpm.init
 # Configuration files for some extensions
-Source50: opcache.ini
+Source50: 10-opcache.ini
 Source51: opcache-default.blacklist
+Source52: 20-oci8.ini
 
 # Build fixes
 Patch5: php-7.0.0-includedir.patch
@@ -1032,6 +1030,7 @@ cp %{SOURCE50} 10-opcache.ini
 cp %{SOURCE51} .
 sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
     -i 10-opcache.ini
+cp %{SOURCE52} 20-oci8.ini
 
 
 %build
@@ -1804,6 +1803,11 @@ fi
 
 
 %changelog
+* Fri Sep  4 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.15.RC2
+- Update to 7.0.0RC2
+- enable oci8 and pdo_oci extensions
+- sync php.ini with upstream php.ini-production
+
 * Sat Aug 22 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.14.RC1
 - Update to 7.0.0RC1
 
-- 
cgit