X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-pecl-mongodb.spec;h=cc59334c9bb125da724ff0770955610b67655cdd;hb=a88e399;hp=89f5a27dea2306973f900da18781d6159a918254;hpb=78f25fe633267df545a230b55d65a75ce88bde69;p=packages%2Fphp-pecl-mongodb.git

diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index 89f5a27..cc59334 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -12,16 +12,18 @@ License:	Apache v2.0
 Group:		Development/Languages/PHP
 Source0:	https://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5:	c3b36a24b7e47e3b4148cd9bc4d163b2
+Source1:	mongodb.ini
+Patch0:		tests.patch
 URL:		https://pecl.php.net/package/mongodb
+BuildRequires:	%{php_name}-cli
 BuildRequires:	%{php_name}-devel >= 4:5.4.0
-BuildRequires:	rpmbuild(macros) >= 1.666
-%if %{with tests}
 BuildRequires:	%{php_name}-json
-%endif
+BuildRequires:	%{php_name}-spl
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	libbson-devel >= 1.5
 BuildRequires:	mongo-c-driver-devel >= 1.5
 BuildRequires:	openssl-devel
+BuildRequires:	rpmbuild(macros) >= 1.666
 Requires:	%{php_name}-json
 %{?requires_php_extension}
 Provides:	php(%{modname}) = %{version}
@@ -36,15 +38,7 @@ MongoDB driver.
 %prep
 %setup -qc
 mv %{modname}-%{version}/* .
-
-# Create configuration file
-cat << 'EOF' > %{modname}.ini
-; Enable %{summary} extension module
-extension=%{modname}.so
-
-; Configuration
-;mongodb.debug=''
-EOF
+%patch0 -p1
 
 %build
 # Sanity check, really often broken
@@ -67,19 +61,27 @@ phpize
 
 %{__make}
 
-%if %{with tests}
-# simple module load test
+# simple module load test, always enabled
 %{__php} -n -q \
 	-d extension_dir=modules \
 	-d extension=%{php_extensiondir}/json.so \
+	-d extension=%{php_extensiondir}/spl.so \
 	-d extension=%{modname}.so \
 	-m > modules.log
 grep %{modname} modules.log
 
+%if %{with tests}
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-%{__make} test \
+exec %{__make} test \
 	PHP_EXECUTABLE=%{__php} \
-	PHP_TEST_SHARED_SYSTEM_EXTENSIONS="json"
+	PHP_TEST_SHARED_SYSTEM_EXTENSIONS="json spl" \
+	RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
+./run-tests.sh
 %endif
 
 %install
@@ -89,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
-cp -p %{modname}.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT