need exts for -m test

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

diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec
index bc98fba660ea3c71c1e41fe5c58a49afdd01bc93..2ed3c81bd43c9ceffa7dffbc028c34f3eaf4f8ca 100644 (file)
--- a/php-pecl-solr.spec
+++ b/php-pecl-solr.spec
@@ -8,28 +8,30 @@
 Summary:       Object oriented API to Apache Solr
 Summary(fr.UTF-8):     API orientée objet pour Apache Solr
 Name:          %{php_name}-pecl-solr
-Version:       2.1.0
-Release:       1
+Version:       2.4.0
+Release:       2
 License:       PHP v3.01
 Group:         Development/Languages
-Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 258865d4517312afda6890827f18f93f
+Source0:       https://pecl.php.net/get/%{modname}-%{version}.tgz
+# Source0-md5: 2c9accf66681a3daaaf371bc07e44902
 Patch0:                tests-online.patch
-URL:           http://pecl.php.net/package/solr
-BuildRequires: %{php_name}-devel >= 4:5.2.3
+URL:           https://pecl.php.net/package/solr
+BuildRequires: %{php_name}-cli
+BuildRequires: %{php_name}-curl
+BuildRequires: %{php_name}-devel >= 4:5.3.0
+BuildRequires: %{php_name}-json
 BuildRequires: curl-devel
 BuildRequires: libxml2-devel >= 1:2.6.16
 BuildRequires: php-packagexml2cl
 BuildRequires: rpmbuild(macros) >= 1.666
 %if %{with tests}
-BuildRequires: %{php_name}-cli
-BuildRequires: %{php_name}-curl
-BuildRequires: %{php_name}-json
+BuildRequires: %{php_name}-pcre
 BuildRequires: %{php_name}-xml
 %endif
 %{?requires_php_extension}
 Requires:      %{php_name}-cli
 Requires:      %{php_name}-json
+Requires:      %{php_name}-pcre
 Requires:      %{php_name}-xml
 Provides:      php(solr) = %{version}
 Obsoletes:     php-pecl-solr < 1.0.2-6
@@ -81,11 +83,21 @@ possible de se connecter à des serveurs via SSL.
 mv %{modname}-%{version}/* .
 %{!?with_network_tests:%patch0 -p1}
 
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+exec %{__make} test \
+       PHP_EXECUTABLE=%{__php} \
+       PHP_TEST_SHARED_SYSTEM_EXTENSIONS="json pcre" \
+       RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
 %build
 packagexml2cl package.xml > ChangeLog
 
 # Check version
-extver=$(awk -F'"' '/define PHP_SOLR_VERSION / {print $2}' php_solr_version.h)
+extver=$(awk -F'"' '/define PHP_SOLR_VERSION / {print $2}' src/php%{php_major_version}/php_solr_version.h)
 if test "x${extver}" != "x%{version}"; then
        : Error: Upstream version is ${extver}, expecting %{version}.
        exit 1
@@ -95,7 +107,6 @@ phpize
 %configure
 %{__make}
 
-%if %{with tests}
 %{__php} -n -q \
        -d extension_dir=modules \
        -d extension=%{php_extensiondir}/curl.so \
@@ -104,10 +115,8 @@ phpize
        -m > modules.log
 grep %{modname} modules.log
 
-export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-%{__make} test \
-       PHP_EXECUTABLE=%{__php} \
-       PHP_TEST_SHARED_SYSTEM_EXTENSIONS="json" \
+%if %{with tests}
+./run-tests.sh --show-diff
 %endif
 
 %install