From 91186080032f03d6803f95a59b6ba0f58b96ada8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Dec 2018 19:18:08 +0100 Subject: update to 7.3.1RC1 oci8 version is now 2.1.8 --- failed.txt | 6 ++---- php73.spec | 24 +++++++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/failed.txt b/failed.txt index 6378902..f5e0440 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 7.3.0 (2018-12-06) +===== 7.3.1RC1 (2018-12-20) $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log @@ -10,12 +10,10 @@ $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log /var/lib/mock/fc27x/build.log:Tests failed : 0 /var/lib/mock/fc28i/build.log:Tests failed : 0 /var/lib/mock/fc28x/build.log:Tests failed : 0 -/var/lib/mock/fc29i/build.log:Tests failed : 1 +/var/lib/mock/fc29i/build.log:Tests failed : 0 /var/lib/mock/fc29x/build.log:Tests failed : 0 -fc29i: - security_level setting to prohibit cert [ext/openssl/tests/stream_security_level.phpt] el8x: buildroot issue with openssl under investigation diff --git a/php73.spec b/php73.spec index 5e13d5b..5b1e270 100644 --- a/php73.spec +++ b/php73.spec @@ -13,7 +13,7 @@ %global pdover 20170320 # Extension version %global fileinfover 1.0.5 -%global oci8ver 2.1.8 +%global oci8ver 2.2.0 %global zipver 1.13.0 %global jsonver 1.7.0 @@ -118,9 +118,9 @@ %global db_devel libdb-devel %endif -%global upver 7.3.0 -#global rcver RC6 -#global lower rc6 +%global upver 7.3.1 +%global rcver RC1 +%global lower RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -700,11 +700,13 @@ License: PHP BuildRequires: oracle-instantclient-devel >= %{oraclever} Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database -Provides: php-pdo_oci, php-pdo_oci%{?_isa} -Obsoletes: php-pecl-oci8 < %{oci8ver} -Conflicts: php-pecl-oci8 >= %{oci8ver} -Provides: php-pecl(oci8) = %{oci8ver}, php-pecl(oci8)%{?_isa} = %{oci8ver} -# Should requires libclntsh.so.12.1, but it's not provided by Oracle RPM. +Provides: php-pdo_oci +Provides: php-pdo_oci%{?_isa} +Obsoletes: php-pecl-oci8 <= %{oci8ver} +Conflicts: php-pecl-oci8 > %{oci8ver} +Provides: php-pecl(oci8) = %{oci8ver} +Provides: php-pecl(oci8)%{?_isa} = %{oci8ver} +# Should requires libclntsh.so.18.3, but it's not provided by Oracle RPM. AutoReq: 0 %if 0%{?rhel} Obsoletes: php53-oci8, php53u-oci8, php54-oci8, php54w-oci8, php55u-oci8, php55w-oci8, php56u-oci8, php56w-oci8 @@ -2192,6 +2194,10 @@ fi %changelog +* Tue Dec 18 2018 Remi Collet - 7.3.1~RC1-1 +- update to 7.3.1RC1 +- oci8 version is now 2.1.8 + * Tue Dec 4 2018 Remi Collet - 7.3.0-1 - update to 7.3.0 GA - update FPM configuration from upstream -- cgit