[packages/php/PHP_5_5] up to 5.5.0alpha2
glen
glen at pld-linux.org
Wed Jan 2 15:14:16 CET 2013
commit 153a312d055a7d9e3db53d163f9cd9fd1eac423b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Jan 2 16:13:58 2013 +0200
up to 5.5.0alpha2
fix-test-run.patch | 10 +++++-----
php.spec | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index f1a1763..8314e3f 100644
--- a/php.spec
+++ b/php.spec
@@ -126,8 +126,8 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
%define orgname php
%define php_suffix 55
-%define rel 0.2
-%define subver alpha1
+%define rel 0.3
+%define subver alpha2
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: 2fb61817fad8e059d6fc846c69803e2d
+# Source0-md5: e634cdb6cb0d5069e8a27d93fb2efda0
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -306,8 +306,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# must be in sync with source. extra check ensuring that it is so is done in %%build
%define php_api_version 20121113
-%define zend_module_api 20121113
-%define zend_extension_api 220121113
+%define zend_module_api 20121212
+%define zend_extension_api 220121212
# Extension versions
%define bz2ver 1.0
diff --git a/fix-test-run.patch b/fix-test-run.patch
index 33d072c..3de5b43 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,8 +12,8 @@
PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
PHP_SUBST(PHP_EXECUTABLE)
---- php-5.3.4/Makefile.global~ 2010-12-12 23:08:32.000000000 +0200
-+++ php-5.3.4/Makefile.global 2010-12-12 23:09:31.246644108 +0200
+--- php-5.5.0alpha2/Makefile.global~ 2013-01-02 15:26:29.000000000 +0200
++++ php-5.5.0alpha2/Makefile.global 2013-01-02 15:29:53.064968422 +0200
@@ -77,7 +77,8 @@
done; \
fi
@@ -37,7 +37,7 @@
fi`
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
-@@ -114,7 +114,10 @@
+@@ -118,7 +118,10 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
@@ -46,9 +46,9 @@
+ -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
+ $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
+ -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
+ TEST_RESULT_EXIT_CODE=$$?; \
rm $(top_builddir)/tmp-php.ini; \
- else \
- echo "ERROR: Cannot run tests without CLI sapi."; \
+ exit $$TEST_RESULT_EXIT_CODE; \
--- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
+++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
@@ -296,7 +296,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/153a312d055a7d9e3db53d163f9cd9fd1eac423b
More information about the pld-cvs-commit
mailing list