diff options
Diffstat (limited to 'php-pecl-solr2.spec')
| -rw-r--r-- | php-pecl-solr2.spec | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index b05fc3f..986524d 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -36,9 +36,6 @@ URL: https://pecl.php.net/package/solr Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -# for PHP 8.2 from https://github.com/php/pecl-search_engine-solr/pull/39 -Patch1: %{pecl_name}-php82.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -100,8 +97,6 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS -%patch1 -p1 -b .pr - : Check version DIR=src/php7 extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' $DIR/php_solr_version.h) @@ -209,9 +204,9 @@ OPT="$OPT -d error_reporting=24575" : Upstream test suite for NTS extension cd NTS +TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -TEST_PHP_EXECUTABLE=%{__php} \ %{__php} -n run-tests.php -q --show-diff %if %{with_zts} @@ -222,9 +217,9 @@ TEST_PHP_EXECUTABLE=%{__php} \ : Upstream test suite for ZTS extension cd ../ZTS +TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -TEST_PHP_EXECUTABLE=%{__ztsphp} \ %{__ztsphp} -n run-tests.php -q --show-diff %endif @@ -244,6 +239,10 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Wed Nov 9 2022 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 +- drop patch merged upstream + * Wed Nov 9 2022 Remi Collet <remi@remirepo.net> - 2.6.0-0 - test build for upcoming 2.6.0 - refresh fix from PHP 8.2 from |