diff options
| author | Remi Collet <remi@remirepo.net> | 2024-01-11 17:08:40 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-01-11 17:08:40 +0100 |
| commit | 7f98c78edd4d66b61346c65a7afc17c62c5fa12c (patch) | |
| tree | d0cfde789cbc9d36548760dc9b33d92eb6892b76 | |
| parent | f22deba518cffc6858e3d90b04a3e608755c070b (diff) | |
another final test build for upcoming 2.7.0
| -rw-r--r-- | 69.patch | 23 | ||||
| -rw-r--r-- | php-pecl-solr2.spec | 10 |
2 files changed, 5 insertions, 28 deletions
diff --git a/69.patch b/69.patch deleted file mode 100644 index bab9534..0000000 --- a/69.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 2eb42ac..1f08a35 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -31,17 +31,16 @@ 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.2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.3%{?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 -BuildRequires: %{?scl_prefix}php-devel >= 7.0 +BuildRequires: %{?scl_prefix}php-devel >= 7.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json @@ -97,8 +96,6 @@ 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) @@ -242,6 +239,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Jan 11 2024 Remi Collet <remi@remirepo.net> - 2.7.0-0.3 +- another final test build for upcoming 2.7.0 + * 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 |