commit 3d8669ae6c45caa68179d074ceb411a285e9b946
Author: Elan Ruusamäe <[email protected]>
Date: Tue Oct 25 13:57:12 2016 +0300
up to 7.1.0RC4
php-systzdata.patch | 10 ++++------
php.spec | 8 ++++----
2 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index a6cc65a..d7f9652 100644
--- a/php.spec
+++ b/php.spec
@@ -134,7 +134,7 @@
%endif
%define rel 0.5
-%define subver RC3
+%define subver RC4
%define orgname php
%define ver_suffix 71
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -154,8 +154,8 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
#Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz
-Source0: https://downloads.php.net/~davey/php-%{version}%{subver}.tar.xz
-# Source0-md5: 2bfa0ad51de4fce87d0175d655f6bf69
+Source0:
https://downloads.php.net/~krakjoe/%{orgname}-%{version}%{subver}.tar.xz
+# Source0-md5: 3493df23aa02af833198df94227cb6d9
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -315,7 +315,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define jsonver 1.5.0
%define pharver 2.0.2
%define sqlite3ver 0.7-dev
-%define zipver 1.13.4
+%define zipver 1.13.5
%define phpdbgver 0.5.0
%define _zend_zts %{!?with_zts:0}%{?with_zts:1}
diff --git a/php-systzdata.patch b/php-systzdata.patch
index a5a7b9d..212820b 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -644,13 +644,12 @@ diff -up php-7.0.0RC1/ext/date/lib/parse_tz.c.systzdata
php-7.0.0RC1/ext/date/li
} else {
tmp = NULL;
}
-diff -up php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata
php-7.0.0RC1/ext/date/lib/timelib.m4
---- php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata 2015-08-18
23:39:24.000000000 +0200
-+++ php-7.0.0RC1/ext/date/lib/timelib.m4 2015-08-22 07:47:34.854055364
+0200
-@@ -78,3 +78,17 @@ stdlib.h
+--- php-7.1.0RC4/ext/date/lib/timelib.m4~ 2016-10-17 14:35:11.000000000
+0300
++++ php-7.1.0RC4/ext/date/lib/timelib.m4 2016-10-25 14:11:32.224877793
+0300
+@@ -78,3 +78,16 @@
dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll strftime)
+ AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday)
+
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
@@ -664,4 +663,3 @@ diff -up php-7.0.0RC1/ext/date/lib/timelib.m4.systzdata
php-7.0.0RC1/ext/date/li
+ [Define for location of system timezone data])
+ fi
+fi
-+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3d8669ae6c45caa68179d074ceb411a285e9b946
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
