consistent build: --with-mongodb-sasl

[packages/php-pecl-mongodb.git] / php-pecl-mongodb.spec

diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index 9cc060695a91d89bd715b14b4c4063f74fe7a2e5..a6c49a7858e84a5af1874e6c9a4aed21edfa1fa3 100644 (file)
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -1,3 +1,7 @@
+# TODO
+# - ix86/x32 (php -m) prints::
+#   src/mongoc/mongoc-handshake.c:478 _append_and_truncate(): precondition failed: space_for_suffix >= 0
+#   Aborted
 #
 # Conditional build:
 %bcond_without tests           # build without tests
@@ -5,26 +9,32 @@
 %define                php_name        php%{?php_suffix}
 %define                modname mongodb
 Summary:       MongoDB driver for PHP
-Name:          php-pecl-%{modname}
-Version:       1.2.8
-Release:       0.1
+Name:          %{php_name}-pecl-%{modname}
+Version:       1.2.11
+Release:       1
 License:       Apache v2.0
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 7c871c22fe7c8afdbe055e24075e95cf
+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}-devel
-BuildRequires: rpmbuild(macros) >= 1.666
-%if %{with tests}
+BuildRequires: %{php_name}-cli
+BuildRequires: %{php_name}-devel >= 4:5.4.0
 BuildRequires: %{php_name}-json
-%endif
+BuildRequires: %{php_name}-pcre
+BuildRequires: %{php_name}-spl
 BuildRequires: cyrus-sasl-devel
+BuildRequires: libbson-devel >= 1.5.0
+BuildRequires: mongo-c-driver-devel >= 1.5.0
 BuildRequires: openssl-devel
-BuildRequires: pkgconfig(libbson-1.0) >= 1.5
-BuildRequires: pkgconfig(libmongoc-1.0) >= 1.5
+BuildRequires: rpmbuild(macros) >= 1.666
 Requires:      %{php_name}-json
+Requires:      %{php_name}-pcre
+Requires:      %{php_name}-spl
 %{?requires_php_extension}
 Provides:      php(%{modname}) = %{version}
+ExcludeArch:   %{ix86} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,15 +46,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
@@ -63,23 +65,33 @@ phpize
 %configure \
        --with-libbson \
        --with-libmongoc \
+       --with-mongodb-sasl \
        --enable-mongodb
 
 %{__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}/pcre.so \
+       -d extension=%{php_extensiondir}/spl.so \
        -d extension=%{php_extensiondir}/json.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="pcre spl json" \
+       RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
+./run-tests.sh
 %endif
 
 %install
@@ -88,13 +100,13 @@ rm -rf $RPM_BUILD_ROOT
        EXTENSION_DIR=%{php_extensiondir} \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
-cp -p %{modname}.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE
 %config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{modname}.ini
 %attr(755,root,root) %{php_extensiondir}/%{modname}.so