[packages/php/dev-7.0] up to 7.0.0RC1
glen
glen at pld-linux.org
Thu Aug 27 11:46:29 CEST 2015
commit eef7f29852eb888780e3c5af82dde88f052e1f44
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Aug 27 12:43:12 2015 +0300
up to 7.0.0RC1
php-systzdata.patch | 12 +++++-------
php.spec | 6 +++---
2 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index 8f9b282..80f055a 100644
--- a/php.spec
+++ b/php.spec
@@ -130,8 +130,8 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
%undefine with_filter
%endif
-%define rel 0.2
-%define subver beta3
+%define rel 0.3
+%define subver RC1
%define orgname php
%define ver_suffix 70
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -152,7 +152,7 @@ License: PHP 3.01 and Zend and BSD
Group: Libraries
#Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
Source0: https://downloads.php.net/~ab/php-%{version}%{subver}.tar.xz
-# Source0-md5: 92b10b1694161d00ac38401da4537ed3
+# Source0-md5: 4ee82dbebd3771d8451bbfb540df1523
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
diff --git a/php-systzdata.patch b/php-systzdata.patch
index aa3277c..a33ef08 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -20,9 +20,8 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision
-diff -up php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata php-5.6.9RC1/ext/date/lib/parse_tz.c
---- php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata 2015-04-30 00:00:18.000000000 +0200
-+++ php-5.6.9RC1/ext/date/lib/parse_tz.c 2015-04-30 06:36:47.019617321 +0200
+--- php-7.0.0RC1/ext/date/lib/parse_tz.c~ 2015-08-27 12:06:04.000000000 +0300
++++ php-7.0.0RC1/ext/date/lib/parse_tz.c 2015-08-27 12:08:08.706661229 +0300
@@ -20,6 +20,16 @@
#include "timelib.h"
@@ -40,11 +39,10 @@ diff -up php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata php-5.6.9RC1/ext/date/li
#include <stdio.h>
#ifdef HAVE_LOCALE_H
-@@ -31,7 +41,12 @@
- #else
- #include <strings.h>
+@@ -43,7 +43,11 @@
#endif
-+
+
+ #define TIMELIB_SUPPORTS_V2DATA
+#ifndef HAVE_SYSTEM_TZDATA
#include "timezonedb.h"
+#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/eef7f29852eb888780e3c5af82dde88f052e1f44
More information about the pld-cvs-commit
mailing list