summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-01-11 16:14:29 +0100
committerRemi Collet <remi@php.net>2024-01-11 16:14:29 +0100
commitf22deba518cffc6858e3d90b04a3e608755c070b (patch)
tree6ffad463568170057697defca91dc0155b47dd0c
parentde124c590bc5b0e34cfad8f91ed19861b7d29463 (diff)
test build for https://github.com/php/pecl-search_engine-solr/pull/69
-rw-r--r--69.patch23
-rw-r--r--php-pecl-solr2.spec20
2 files changed, 32 insertions, 11 deletions
diff --git a/69.patch b/69.patch
new file mode 100644
index 0000000..bab9534
--- /dev/null
+++ b/69.patch
@@ -0,0 +1,23 @@
+From 7eb16d71722a54e04c8a309f5588c02f45680e9a Mon Sep 17 00:00:00 2001
+From: Birgir Haraldsson <biggi@stefna.is>
+Date: Thu, 11 Jan 2024 16:07:40 +0100
+Subject: [PATCH] Fix 019 getdebug test when response has "processing"
+
+---
+ tests/019.solrclient_getdebug.phpt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/019.solrclient_getdebug.phpt b/tests/019.solrclient_getdebug.phpt
+index b8e07898..ff4b66d6 100644
+--- a/tests/019.solrclient_getdebug.phpt
++++ b/tests/019.solrclient_getdebug.phpt
+@@ -33,7 +33,8 @@ foreach ( $lines as $line) {
+ 0 === strpos($line, 'Hostname') ||
+ 0 === strpos($line, 'TCP_NODELAY') ||
+ 0 === strpos($line, 'Accept-Encoding') ||
+- 0 === strpos($line, 'Curl_http_done')
++ 0 === strpos($line, 'Curl_http_done') ||
++ 0 === strpos($line, 'processing:')
+ ) {
+ $print = false;
+ } else {
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec
index 4fdb05d..2eb42ac 100644
--- a/php-pecl-solr2.spec
+++ b/php-pecl-solr2.spec
@@ -31,12 +31,13 @@ Summary: Object oriented API to Apache Solr
Summary(fr): API orientée objet pour Apache Solr
Name: %{?scl_prefix}php-pecl-solr2
Version: 2.7.0
-Release: 0.1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 0.2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: https://pecl.php.net/package/solr
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Patch0: 69.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -96,6 +97,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd %{sources}
+%patch -P0 -p1
+
: Check version
DIR=src/php7
extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' $DIR/php_solr_version.h)
@@ -185,21 +188,13 @@ fi
%check
cd %{sources}
%if %{with fulltests}
-sed -e '/SOLR_SERVER_CONFIGURED/s/false/true/' \
- -e '/SOLR_SERVER_HOSTNAME/s/solr.test/localhost/' \
- -i tests/test.config.inc
+export SOLR_SERVER_CONFIGURED=1
%else
-sed -e '/SOLR_SERVER_CONFIGURED/s/true/false/' \
- -i tests/test.config.inc
+export SOLR_SERVER_CONFIGURED=0
%endif
OPT="-n"
-# temporarily disable deprecated
-%if "%{php_version}" > "8.1"
-OPT="$OPT -d error_reporting=24575"
-%endif
-
[ -f %{php_extdir}/curl.so ] && OPT="$OPT -d extension=curl.so"
[ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so"
@@ -247,6 +242,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0.2
+- test build for https://github.com/php/pecl-search_engine-solr/pull/69
+
* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0.1
- final test build for upcoming 2.7.0