From 8bb22389704c5396a07e72aaf3519f964023e31f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Mar 2022 08:03:49 +0100 Subject: build for PHP 8.1 ignoring deprecation --- php-pecl-solr2.spec | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'php-pecl-solr2.spec') diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 9d88a89..50dc99d 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -3,7 +3,7 @@ # # Fedora spec file for php-pecl-solr2 # -# Copyright (c) 2011-2020 Remi Collet +# Copyright (c) 2011-2022 Remi Collet # Copyright (c) 2010 Johan Cwiklinski # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ @@ -30,14 +30,16 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?sub_prefix}php-pecl-solr2 Version: 2.5.1 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 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 -BuildRequires: %{?scl_prefix}php-devel > 7 +BuildRequires: make +BuildRequires: %{?dtsprefix}gcc +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json @@ -66,20 +68,9 @@ Provides: %{?sub_prefix}php-pecl-%{pecl_name} = %{version}-%{rele Provides: %{?sub_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73-pecl-%{pecl_name}2 <= %{version} -%endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74-pecl-%{pecl_name}2 <= %{version} -%endif %endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} %endif @@ -208,7 +199,7 @@ sed -e '/SOLR_SERVER_CONFIGURED/s/true/false/' \ -i ?TS/tests/test.config.inc %endif -OPT="-n" +OPT="-n -d error_reporting=24575" [ -f %{php_extdir}/curl.so ] && OPT="$OPT -d extension=curl.so" [ -f %{php_extdir}/json.so ] && OPT="$OPT -d extension=json.so" @@ -221,9 +212,8 @@ OPT="-n" cd NTS TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__php} \ -%{__php} -n run-tests.php --show-diff +%{__php} -n run-tests.php -q --show-diff %if %{with_zts} : Minimal load test for ZTS installed extension @@ -235,9 +225,8 @@ TEST_PHP_EXECUTABLE=%{__php} \ cd ../ZTS TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ REPORT_EXIT_STATUS=1 \ -NO_INTERACTION=1 \ TEST_PHP_EXECUTABLE=%{__ztsphp} \ -%{__ztsphp} -n run-tests.php --show-diff +%{__ztsphp} -n run-tests.php -q --show-diff %endif @@ -256,6 +245,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Thu Mar 17 2022 Remi Collet - 2.5.1-3 +- build for PHP 8.1 ignoring deprecation + * Wed Sep 30 2020 Remi Collet - 2.5.1-2 - rebuild for PHP 8.0.0RC1 -- cgit