From 625cf3d0d498a46123a95be59172d0bb69af0e7e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Apr 2016 11:00:42 +0200 Subject: PHP 5.6.21RC1 --- failed.txt | 2 +- php.spec | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/failed.txt b/failed.txt index 68c3d3a..c9bb9d8 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 5.6.20 (2016-03-31) +===== 5.6.21RC1 (2016-04-18) $ grep -r 'Tests failed' /var/lib/mock/scl56*/build.log diff --git a/php.spec b/php.spec index 7b0cbd4..333c5be 100644 --- a/php.spec +++ b/php.spec @@ -27,7 +27,7 @@ %global pdover 20080721 # Extension version %global opcachever 7.0.6-dev -%global oci8ver 2.0.10 +%global oci8ver 2.0.11 # Use for first build of PHP (before pecl/zip and pecl/jsonc) %global php_bootstrap 0 @@ -137,12 +137,12 @@ %global db_devel libdb-devel %endif -#global rcver RC1 +%global rcver RC1 %global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: 5.6.20 +Version: 5.6.21 %if 0%{?rcver:1} Release: 0.%{rpmrel}.%{rcver}%{?dist} %else @@ -179,10 +179,6 @@ Patch7: php-5.3.0-recode.patch Patch8: php-5.6.17-libdb.patch Patch9: php-5.5.30-curl.patch -# Fixes for extension modules -# https://bugs.php.net/63171 no odbc call during timeout -Patch21: php-5.4.7-odbctimer.patch - # Functional changes Patch40: php-5.4.0-dlopen.patch Patch42: php-5.6.13-systzdata-v12.patch @@ -883,8 +879,6 @@ support for using the enchant library to PHP. %patch9 -p1 -b .curltls %endif -%patch21 -p1 -b .odbctimer - %patch40 -p1 -b .dlopen %patch42 -p1 -b .systzdata %patch43 -p1 -b .headers @@ -1813,6 +1807,10 @@ fi %changelog +* Mon Apr 18 2016 Remi Collet 5.6.21-0.1.RC1 +- update to 5.6.21RC1 +- bump oci8 version to 2.0.11 + * Thu Mar 31 2016 Remi Collet 5.6.20-1 - Update to 5.6.20 http://www.php.net/releases/5_6_20.php -- cgit