From 43fe5d3fa96f9785b22bf24131e7efa282acf185 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 25 May 2015 08:32:57 +0200
Subject: php70-php-7.0.0-0.6.20150525git404360f
---
failed.txt | 2 ++
php-5.6.3-phpinfo.patch | 10 +++++-----
php.spec | 7 +++++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/failed.txt b/failed.txt
index 683d927..cc6d06c 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,3 +1,5 @@
+===== 7.0.0-0.6.20150525git404360f
+
$ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
/var/lib/mock/scl70el6x/build.log:Tests failed : 0 ( 0.0%) ( 0.0%)
diff --git a/php-5.6.3-phpinfo.patch b/php-5.6.3-phpinfo.patch
index a11a298..690e121 100644
--- a/php-5.6.3-phpinfo.patch
+++ b/php-5.6.3-phpinfo.patch
@@ -3,9 +3,9 @@ Drop "Configure Command" from phpinfo as it doesn't
provide any useful information.
The available extensions are not related to this command.
---- php-5.4.9/ext/standard/info.c.orig 2012-12-11 10:43:02.450578276 +0100
-+++ php-5.4.9/ext/standard/info.c 2012-12-11 10:44:12.530820821 +0100
-@@ -743,9 +743,6 @@
+--- a/ext/standard/info.c.orig 2012-12-11 10:43:02.450578276 +0100
++++ b/ext/standard/info.c 2012-12-11 10:44:12.530820821 +0100
+@@ -660,9 +660,6 @@
#ifdef ARCHITECTURE
php_info_print_table_row(2, "Architecture", ARCHITECTURE);
#endif
@@ -15,8 +15,8 @@ The available extensions are not related to this command.
if (sapi_module.pretty_name) {
php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
---- php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt.orig 2012-12-11 11:07:26.959156091 +0100
-+++ php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt 2012-12-11 11:07:30.899170970 +0100
+--- a/ext/standard/tests/general_functions/phpinfo.phpt.orig 2012-12-11 11:07:26.959156091 +0100
++++ b/ext/standard/tests/general_functions/phpinfo.phpt 2012-12-11 11:07:30.899170970 +0100
@@ -20,7 +20,6 @@
System => %s
diff --git a/php.spec b/php.spec
index 53dfde4..9744292 100644
--- a/php.spec
+++ b/php.spec
@@ -125,9 +125,9 @@
%global db_devel libdb-devel
%endif
-%global gh_commit cee88571d9dbb2d56b78b312919aea190580d9e5
+%global gh_commit 404360f261ef56b478228caf8f5371ddbe6feaf2
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20150518
+%global gh_date 20150525
%global gh_owner php
%global gh_project php-src
#global rcver RC1
@@ -1808,6 +1808,9 @@ fi
%changelog
+* Mon May 25 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.6.20150525git404360f
+- new snapshot
+
* Mon May 18 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.6.20150518gitcee8857
- new snapshot
--
cgit