From c4408a33e45a9f453db20a87341b0316b8f5e2f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 16 Sep 2022 12:08:40 +0200 Subject: add patch for PHP 8.2 from https://github.com/viest/php-ext-xlswriter/pull/451 --- php-pecl-xlswriter.spec | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'php-pecl-xlswriter.spec') diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index a0cc04d..f907383 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -15,7 +15,6 @@ %if 0%{?scl:1} %scl_package php-pecl-xlswriter -%global sub_prefix %{scl_prefix} %endif %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} @@ -29,13 +28,15 @@ %endif Summary: An efficient and fast xlsx file extension -Name: %{?sub_prefix}php-pecl-%{pecl_name} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.5.2 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: %{pecl_name}-php82.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -63,22 +64,6 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.0" -Obsoletes: php80-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.1" -Obsoletes: php81-pecl-%{pecl_name} <= %{version} -%endif -%endif %description @@ -122,6 +107,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr451 + %if %{with syslib} # we use the system libraries rm -r library @@ -228,6 +215,9 @@ OPT="$OPT %{?_smp_mflags}" rm ?TS/tests/open_xlsx_get_data_skip_empty.phpt rm ?TS/tests/open_xlsx_next_row_skip_empty.phpt %endif +%if "%{php_version}" > "8.2" +rm ?TS/tests/validation_limiting_input_to_a_value_in_a_dropdown_list.phpt +%endif cd NTS : Minimal load test for NTS extension @@ -274,6 +264,10 @@ cd .. %changelog +* Fri Sep 16 2022 Remi Collet - 1.5.2-2 +- add patch for PHP 8.2 from + https://github.com/viest/php-ext-xlswriter/pull/451 + * Thu Apr 28 2022 Remi Collet - 1.5.2-1 - update to 1.5.2 -- cgit