summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-04-11 13:44:59 +0200
committerRemi Collet <remi@remirepo.net>2017-04-11 13:44:59 +0200
commitdeb5de81f2bc9fb1be4724e548237db530610575 (patch)
treefb8bdfd7f022b89eaccecb057d89340353c6d583
parent1f2047f244aaa0ef35a2bf9fca5793b897f0b8f7 (diff)
v7.0.18
-rw-r--r--failed.txt9
-rw-r--r--php-7.0.0-systzdata-v14.patch3
-rw-r--r--php.spec5
3 files changed, 12 insertions, 5 deletions
diff --git a/failed.txt b/failed.txt
index f9f7117..da8a7a1 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.0.18RC1 (2017-03-30)
+===== 7.0.18 (2017-04-13)
$ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
@@ -6,10 +6,11 @@ $ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
/var/lib/mock/scl70el7x/build.log:Tests failed : 1
/var/lib/mock/scl70fc23x/build.log:Tests failed : 0
/var/lib/mock/scl70fc24x/build.log:Tests failed : 1
-/var/lib/mock/scl70fc25x/build.log:Tests failed : 1
-/var/lib/mock/scl70fc26x/build.log:Tests failed : 1
+/var/lib/mock/scl70fc25x/build.log:Tests failed : 0
+/var/lib/mock/scl70fc26x/build.log:Tests failed : 0
-fc24x, fc25x, fc26x
+
+el6x, el7x, fc24x
*** Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt]
diff --git a/php-7.0.0-systzdata-v14.patch b/php-7.0.0-systzdata-v14.patch
index 8ff32c8..dd6b784 100644
--- a/php-7.0.0-systzdata-v14.patch
+++ b/php-7.0.0-systzdata-v14.patch
@@ -1,3 +1,6 @@
+# License: MIT
+# http://opensource.org/licenses/MIT
+
Add support for use of the system timezone database, rather
than embedding a copy. Discussed upstream but was not desired.
diff --git a/php.spec b/php.spec
index 08e31f9..454d957 100644
--- a/php.spec
+++ b/php.spec
@@ -123,7 +123,7 @@
%global db_devel libdb-devel
%endif
-%global rcver RC1
+#global rcver RC1
%global rpmrel 1
@@ -1833,6 +1833,9 @@ fi
%changelog
+* Tue Apr 11 2017 Remi Collet <remi@fedoraproject.org> 7.0.18-1
+- Update to 7.0.18 - http://www.php.net/releases/7_0_18.php
+
* Tue Mar 28 2017 Remi Collet <remi@fedoraproject.org> 7.0.18-0.1.RC1
- Update to 7.0.18RC1