From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 23 Nov 2014 02:35:14 +0000 (+0200)
Subject: fix tests makefile
X-Git-Tag: auto/th/php53-5.3.29-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=commitdiff_plain;h=f1179e4

fix tests makefile
---

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 12dd192..4e48667 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,8 +12,8 @@
  PHP_SUBST(PHP_MODULES)
  PHP_SUBST(PHP_ZEND_EX)
  
---- php-5.3.29/Makefile.global~	2014-08-19 16:59:48.000000000 +0300
-+++ php-5.3.29/Makefile.global	2014-08-19 17:47:47.112627301 +0300
+--- php-5.3.29/Makefile.global	2014-08-19 17:47:47.112627301 +0300
++++ php-5.3.29/Makefile.global	2014-11-23 04:22:05.601031944 +0200
 @@ -77,8 +77,15 @@
  		done; \
  	fi
@@ -31,11 +31,12 @@
  	if test "x$(PHP_MODULES)" != "x"; then \
  		for i in $(PHP_MODULES)""; do \
  			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -114,7 +114,9 @@
+@@ -107,7 +114,10 @@
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
  		CC="$(CC)" \
 -			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(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) $(TESTS); \
++			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
 +			-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); \
diff --git a/php.spec b/php.spec
index 6509338..1c60519 100644
--- a/php.spec
+++ b/php.spec
@@ -119,7 +119,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 %endif
 
-%define		rel	3
+%define		rel	4
 %define		orgname	php
 %define		ver_suffix 53
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}