diff options
| author | Remi Collet <remi@remirepo.net> | 2022-09-09 15:40:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2022-09-09 15:40:21 +0200 |
| commit | 97e518d714b116460e0aa9b878a982aa96da8a44 (patch) | |
| tree | f2dc1ebf42d654a18bbe952522a3796ecf6e832c /php-pecl-solr2.spec | |
| parent | fb4c17732956a11ffcf000e394b669c7d109a751 (diff) | |
add fix from PHP 8.2 from
https://github.com/php/pecl-search_engine-solr/pull/39
Diffstat (limited to 'php-pecl-solr2.spec')
| -rw-r--r-- | php-pecl-solr2.spec | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index 649aabc..3b094e1 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -12,7 +12,6 @@ # %if 0%{?scl:1} %scl_package php-pecl-solr2 -%global sub_prefix %{scl_prefix} %endif %global pecl_name solr @@ -28,9 +27,9 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr -Name: %{?sub_prefix}php-pecl-solr2 +Name: %{?scl_prefix}php-pecl-solr2 Version: 2.5.1 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: https://pecl.php.net/package/solr @@ -40,6 +39,8 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz # compat with 8.1 from upstream # compat with older from https://github.com/php/pecl-search_engine-solr/pull/32 Patch0: %{pecl_name}-build.patch +# 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 @@ -63,19 +64,9 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release} -%endif -Obsoletes: %{?sub_prefix}php-pecl-%{pecl_name} < 2 -Provides: %{?sub_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?sub_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} - -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%endif -%endif +Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 2 +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %description @@ -113,6 +104,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS cd NTS %patch0 -p1 -b .up +%patch1 -p1 -b .pr : Check version DIR=src/php7 @@ -256,6 +248,10 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \ %changelog +* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 2.5.1-5 +- add fix from PHP 8.2 from + https://github.com/php/pecl-search_engine-solr/pull/39 + * Thu Mar 17 2022 Remi Collet <remi@remirepo.net> - 2.5.1-4 - add upstream to fix deprecation on return type - fix compatiblity with older PHP verison from |