packages: php-xhp/php-xhp.spec - up to 1.3.9, make tests non-interactive, t...

[glen]

Author: glen                         Date: Sun Oct 31 11:54:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.9, make tests non-interactive, tests pass

---- Files affected:
packages/php-xhp:
   php-xhp.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/php-xhp/php-xhp.spec
diff -u packages/php-xhp/php-xhp.spec:1.4 packages/php-xhp/php-xhp.spec:1.5
--- packages/php-xhp/php-xhp.spec:1.4	Sun May 16 15:56:06 2010
+++ packages/php-xhp/php-xhp.spec	Sun Oct 31 12:54:17 2010
@@ -6,13 +6,13 @@
 %define		modname	xhp
 Summary:	Inline XML For PHP
 Name:		php-%{modname}
-Version:	1.3.8
-Release:	2
+Version:	1.3.9
+Release:	1
 License:	PHP 3.01
 Group:		Development/Languages/PHP
 Source0:	http://github.com/facebook/xhp/tarball/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	3abc2cdb5ba57594db7c4d7445c6000d
-URL:		http://wiki.github.com/facebook/xhp/
+# Source0-md5:	38cab2551dc3a4e1bc5a68d2be39e64a
+URL:		http://github.com/facebook/xhp/wiki
 # if you use git checkout:
 #BuildRequires:	bison >= 2.3
 #BuildRequires:	flex >= 2.5.35
@@ -45,22 +45,38 @@
 mv facebook-%{modname}-*/* .
 
 %build
+%{__make} -C xhp \
+	libdir=%{_libdir} \
+	CXX="%{__cxx}" \
+	OPTFLAGS="%{rpmcxxflags}"
+
 phpize
 %configure
 %{__make} \
+	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	CPPFLAGS="-fPIC %{rpmcxxflags} -minline-all-stringops"
+	CXXFLAGS="%{rpmcxxflags}"
 
-%{?with_tests:%{__make} test}
+%if %{with tests}
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+unset TZ LANG LC_ALL || :
+%{__make} test \
+	RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+./run-tests.sh -w failed.log -s test.log
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
-
 %{__make} install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT \
 	INSTALL_HEADERS=xhp/xhp_preprocess.hpp \
-	EXTENSION_DIR=%{php_extensiondir}
+	EXTENSION_DIR=%{php_extensiondir} \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
 cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
 ; Enable %{modname} extension module
 extension=%{modname}.so
@@ -94,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/10/31 11:54:17  glen
+- up to 1.3.9, make tests non-interactive, tests pass
+
 Revision 1.4  2010/05/16 13:56:06  glen
 - add -devel; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-xhp/php-xhp.spec?r1=1.4&r2=1.5&f=u