summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php.spec24
2 files changed, 17 insertions, 9 deletions
diff --git a/failed.txt b/failed.txt
index 7b5cfad..ff09bf2 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.0alpha3 (2017-07-06)
+===== 7.1.0beta1 (2017-07-20)
$ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log
/var/lib/mock/scl72el6x/build.log:Tests failed : 0
diff --git a/php.spec b/php.spec
index c7727e1..d75f017 100644
--- a/php.spec
+++ b/php.spec
@@ -22,11 +22,11 @@
%endif
# API/ABI check
-%global apiver 20160731
-%global zendver 20160731
+%global apiver 20170718
+%global zendver 20170718
%global pdover 20170320
# Extension version
-%global oci8ver 2.1.5
+%global oci8ver 2.1.6
# Adds -z now to the linker flags
%global _hardened_build 1
@@ -130,11 +130,11 @@
%global gh_commit 249f75e7e423ce858827c1d13231e1f762a9b267
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20170711
+#global gh_date 20170711
%global gh_owner php
%global gh_project php-src
-#global rcver alpha3
-%global rpmrel 12
+%global rcver beta1
+%global rpmrel 13
Summary: PHP scripting language for creating dynamic web sites
@@ -880,11 +880,14 @@ Summary: Wrapper for the Sodium cryptographic library
License: PHP
Group: System Environment/Libraries
# Ensure libsodium-last is used
-BuildRequires: libsodium-devel >= 1.0.12
+BuildRequires: pkgconfig(libsodium) >= 1.0.13
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
# not provided as API is different
-Obsoletes: %{?scl_prefix}php-pecl-libsodium < 7
+Obsoletes: %{?scl_prefix}php-pecl-libsodium < 7
+Obsoletes: %{?scl_prefix}php-pecl-libsodium2 < 7
+Provides: %{?scl_prefix}php-pecl(libsodium) = %{version}
+Provides: %{?scl_prefix}php-pecl(libsodium)%{?_isa} = %{version}
%description sodium
The %{?scl_prefix}php-sodium package provides a simple,
@@ -1842,6 +1845,11 @@ fi
%changelog
+* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.13.beta1
+- update to 7.2.0beta1
+- oci8 version is now 2.1.6
+- bump apiver and zendver to 20170718
+
* Tue Jul 11 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.12.20170611.249f75e
- test build
- add sodium extension in new sub-package