From ec2a79ee94daa89ec634c9659aa7c2a6848cadc4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 16 Sep 2022 14:13:38 +0200 Subject: add upstream patches for PHP 8.2 --- php-pecl-openswoole.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'php-pecl-openswoole.spec') diff --git a/php-pecl-openswoole.spec b/php-pecl-openswoole.spec index d5c424c..41e2804 100644 --- a/php-pecl-openswoole.spec +++ b/php-pecl-openswoole.spec @@ -35,13 +35,18 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -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;')}} # Extension is ASL 2.0 # Hiredis is BSD License: ASL 2.0 and BSD URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +# git checkout 4.x +# git diff v4.11.1 -- ext-src/ include/ thirdparty/ src/ +# remove include/swoole_version.h +Patch0: %{pecl_name}-php82.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -86,16 +91,7 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Conflicts: %{?scl_prefix}php-pecl-swoole Conflicts: %{?scl_prefix}php-pecl-swoole2 Conflicts: %{?scl_prefix}php-pecl-swoole4 - -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%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 +Conflicts: %{?scl_prefix}php-pecl-swoole5 %description @@ -148,6 +144,10 @@ sed \ cd NTS +%if "%{php_version}" > "8.2" +%patch0 -p1 -b .up +%endif + cp -p thirdparty/hiredis/COPYING hiredis-COPYING cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING @@ -322,6 +322,9 @@ cd ../ZTS %changelog +* Fri Sep 16 2022 Remi Collet - 4.11.1-2 +- add upstream patches for PHP 8.2 + * Fri Apr 29 2022 Remi Collet - 4.11.1-1 - update to 4.11.1 -- cgit