summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--failed.txt28
-rw-r--r--php-7.0.10-datetests.patch24
-rw-r--r--php70.spec13
4 files changed, 26 insertions, 41 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..70514af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+php-*.tar.xz
+php-*.src.rpm
diff --git a/failed.txt b/failed.txt
index a4a683e..7734df3 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,23 +1,27 @@
-===== 7.0.17 (2017-03-16)
+===== 7.0.18RC1 (2017-03-30)
$ grep -r 'Tests failed' /var/lib/mock/*/build.log
-/var/lib/mock/el6i/build.log:Tests failed : 0
-/var/lib/mock/el6x/build.log:Tests failed : 0
+/var/lib/mock/el6i/build.log:Tests failed : 1
+/var/lib/mock/el6x/build.log:Tests failed : 1
/var/lib/mock/el7x/build.log:Tests failed : 1
/var/lib/mock/fc23i/build.log:Tests failed : 0
/var/lib/mock/fc23x/build.log:Tests failed : 0
-/var/lib/mock/fc24i/build.log:Tests failed : 0
+/var/lib/mock/fc24i/build.log:Tests failed : 3
/var/lib/mock/fc24x/build.log:Tests failed : 1
-/var/lib/mock/fc25i/build.log:Tests failed : 0
-/var/lib/mock/fc25x/build.log:Tests failed : 0
+/var/lib/mock/fc25i/build.log:Tests failed : 1
+/var/lib/mock/fc25x/build.log:Tests failed : 1
-el7x
- * Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
-fc24x
- * Bug #69900 Commandline input/output weird behaviour with STDIO [ext/standard/tests/streams/proc_open_bug69900.phpt]
+fc24i
+ (1) Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
+ (1) Bug #69900 Commandline input/output weird behaviour with STDIO [ext/standard/tests/streams/proc_open_bug69900.phpt]
+el6i, el6x, el7x, fc24i, fc24x, fc25i fc25x
+ (4) Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt]
-* proc_open give erratic test results :(
-** test fixed upstream
+(1) proc_open give erratic test results :(
+(2) test issue (fixed upstream)
+(3) known issue
+(4) bugs related to tzdata 2017a (repo) vs 2017b (php)
+
diff --git a/php-7.0.10-datetests.patch b/php-7.0.10-datetests.patch
index c3a65e9..7df99a5 100644
--- a/php-7.0.10-datetests.patch
+++ b/php-7.0.10-datetests.patch
@@ -42,27 +42,3 @@ diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strto
string(31) "Fri, 16 Jun 2006 02:22:33 +0100"
bool(false)
string(31) "Tue, 02 Mar 2004 00:00:00 +0000"
-diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt
---- ./ext/date/tests/bug33414-2.phpt.datetests 2016-07-21 02:23:03.000000000 +0200
-+++ ./ext/date/tests/bug33414-2.phpt 2016-07-26 07:28:10.323598643 +0200
-@@ -74,7 +74,7 @@ $strtotime_tstamp = strtotime("next Frid
- print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
- print "wanted=Friday 00:00:00\n\n";
- ?>
----EXPECT--
-+--EXPECTF--
- TZ=Pacific/Rarotonga - wrong day.
- tStamp=Thursday 1970-01-01 17:17:17 CKT 0
- result=Tuesday 1970-01-06 00:00:00 CKT 0
-@@ -106,8 +106,8 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1
- wanted=Tuesday 00:00:00
-
- TZ=Pacific/Pitcairn - wrong day.
--tStamp=Thursday 1970-01-01 17:17:17 PNT 0
--result=Wednesday 1970-01-07 00:00:00 PNT 0
-+tStamp=Thursday 1970-%s
-+result=Wednesday 1970-%s
- wanted=Wednesday 00:00:00
-
- TZ=Pacific/Fakaofo - wrong day.
-
diff --git a/php70.spec b/php70.spec
index 9935e05..07b575e 100644
--- a/php70.spec
+++ b/php70.spec
@@ -120,12 +120,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: php
-Version: 7.0.17
+Version: 7.0.18
Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -2054,13 +2054,16 @@ fi
%changelog
-* Tue Mar 14 2017 Remi Collet <remi@fedoraproject.org> 7.0.17-1
+* Wed Mar 29 2017 Remi Collet <remi@fedoraproject.org> - 7.0.18-0.1.RC1
+- Update to 7.0.18RC1
+
+* Tue Mar 14 2017 Remi Collet <remi@fedoraproject.org> - 7.0.17-1
- Update to 7.0.17 - http://www.php.net/releases/7_0_17.php
-* Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> 7.0.17-0.1.RC1
+* Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> - 7.0.17-0.1.RC1
- Update to 7.0.17RC1
-* Tue Feb 14 2017 Remi Collet <remi@fedoraproject.org> 7.0.16-1
+* Tue Feb 14 2017 Remi Collet <remi@fedoraproject.org> - 7.0.16-1
- Update to 7.0.16 - http://www.php.net/releases/7_0_16.php
* Thu Feb 2 2017 Remi Collet <remi@fedoraproject.org> - 7.0.16-0.2.RC1