commit 553dd2f2be83606d2ed508c28b635d46178a2db0
Author: Elan Ruusamäe <[email protected]>
Date: Tue Mar 19 18:27:18 2013 +0200
up to 5.5.0 alpha6
pcre-shared.patch | 14 +++++++-------
php.spec | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/php.spec b/php.spec
index d50f93b..74c4a3b 100644
--- a/php.spec
+++ b/php.spec
@@ -127,7 +127,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%define php_suffix 55
%define rel 0.3
-%define subver alpha3
+%define subver alpha6
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -141,7 +141,7 @@ Epoch: 4
License: PHP
Group: Libraries
Source0:
http://downloads.php.net/dsp/%{orgname}-%{version}%{subver}.tar.xz
-# Source0-md5: 8c537fbbf4c7439ceec36297b4deac8c
+# Source0-md5: c2aa16727f554fc4a1fda7db09d251f2
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
diff --git a/pcre-shared.patch b/pcre-shared.patch
index 39632a0..642207d 100644
--- a/pcre-shared.patch
+++ b/pcre-shared.patch
@@ -1,5 +1,5 @@
---- php-5.3.1/ext/pcre/config0.m4 2009-11-27 08:19:08.836025192 +0000
-+++ php-5.3.1/ext/pcre/config0.m4 2009-11-30 22:09:24.385647500 +0000
+--- php-5.5.0alpha6/ext/pcre/config0.m4~ 2013-03-19 18:08:15.000000000
+0200
++++ php-5.5.0alpha6/ext/pcre/config0.m4 2013-03-19 18:09:26.732804962
+0200
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
@@ -34,12 +34,12 @@
else
AC_MSG_CHECKING([for PCRE library to use])
AC_MSG_RESULT([bundled])
-@@ -59,7 +60,7 @@
- pcrelib/pcre_ord2utf8.c
pcrelib/pcre_refcount.c pcrelib/pcre_study.c \
- pcrelib/pcre_tables.c
pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c \
+@@ -61,7 +61,7 @@
+ pcrelib/pcre_tables.c
pcrelib/pcre_valid_utf8.c \
pcrelib/pcre_version.c pcrelib/pcre_xclass.c"
-- PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c,
no,,-I@ext_srcdir@/pcrelib)
-+ PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c,
$ext_shared,,-I@ext_srcdir@/pcrelib)
+ PHP_PCRE_CFLAGS="-DHAVE_CONFIG_H -I@ext_srcdir@/pcrelib"
+- PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,$PHP_PCRE_CFLAGS)
++ PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c,
$ext_shared,,$PHP_PCRE_CFLAGS)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/553dd2f2be83606d2ed508c28b635d46178a2db0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
