X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp-pecl-solr.git;a=blobdiff_plain;f=php-pecl-solr.spec;h=2ed3c81bd43c9ceffa7dffbc028c34f3eaf4f8ca;hp=8fb4a6d67f111503cdfca9371219e364fca2a669;hb=53f4a90;hpb=a809e4e72812f54482ccbf98a4f8a71f2037f9ef

diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec
index 8fb4a6d..2ed3c81 100644
--- a/php-pecl-solr.spec
+++ b/php-pecl-solr.spec
@@ -1,33 +1,37 @@
 #
 # Conditional build:
 %bcond_without	tests		# build without tests
+%bcond_with	network_tests	# run tests requiring setup Solr Server on localhost:8983
 
 %define		php_name	php%{?php_suffix}
 %define		modname solr
 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
-URL:		http://pecl.php.net/package/solr
-BuildRequires:	%{php_name}-devel >= 4:5.2.3
+Source0:	https://pecl.php.net/get/%{modname}-%{version}.tgz
+# Source0-md5:	2c9accf66681a3daaaf371bc07e44902
+Patch0:		tests-online.patch
+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
@@ -77,12 +81,23 @@ possible de se connecter à des serveurs via SSL.
 %prep
 %setup -qc
 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
@@ -92,7 +107,6 @@ phpize
 %configure
 %{__make}
 
-%if %{with tests}
 %{__php} -n -q \
 	-d extension_dir=modules \
 	-d extension=%{php_extensiondir}/curl.so \
@@ -100,6 +114,9 @@ phpize
 	-d extension=%{modname}.so \
 	-m > modules.log
 grep %{modname} modules.log
+
+%if %{with tests}
+./run-tests.sh --show-diff
 %endif
 
 %install
@@ -117,6 +134,14 @@ EOF
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%php_webserver_restart
+
+%postun
+if [ "$1" = 0 ]; then
+	%php_webserver_restart
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog CREDITS README.SUBMITTING_CONTRIBUTIONS README.MEMORY_ALLOCATION