From 1fd143a60ceb86c9941a75ba2025cebf6fe9908b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Dec 2021 08:57:31 +0100 Subject: update to 4.9.0 add patch for libcurl < 7.56 (EL-7) from https://github.com/openswoole/swoole-src/pull/103 --- php-pecl-openswoole.spec | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'php-pecl-openswoole.spec') diff --git a/php-pecl-openswoole.spec b/php-pecl-openswoole.spec index 0ba2c64..d5af860 100644 --- a/php-pecl-openswoole.spec +++ b/php-pecl-openswoole.spec @@ -28,7 +28,7 @@ %endif %bcond_without pgsql -%global upstream_version 4.8.1 +%global upstream_version 4.9.0 #global upstream_prever RC2 @@ -42,6 +42,8 @@ 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 +Patch0: openswoole-oldcurl.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -82,10 +84,10 @@ 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} -# Single version can be installed (same symbols) -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 4 -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}2 < 4 -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}4 < 5 +# Only one extension can be installed (same symbols) +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} %if "%{php_version}" > "7.4" @@ -129,10 +131,6 @@ Summary: %{name} developer files (header) Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{?scl_prefix}php-devel%{?_isa} -# Single version can be installed (same ext name) -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}-devel < 4 -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}2-devel < 4 -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}4-devel < 5 %description devel These are the files needed to compile programs using %{name}. @@ -154,6 +152,8 @@ sed \ cd NTS +%patch0 -p1 + cp -p thirdparty/hiredis/COPYING hiredis-COPYING cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING @@ -326,6 +326,11 @@ cd ../ZTS %changelog +* Mon Dec 20 2021 Remi Collet - 4.9.0-1 +- update to 4.9.0 +- add patch for libcurl < 7.56 (EL-7) from + https://github.com/openswoole/swoole-src/pull/103 + * Mon Nov 29 2021 Remi Collet - 4.8.1-1 - update to 4.8.1 - drop patch merged upstream -- cgit