diff options
| author | Remi Collet <remi@remirepo.net> | 2024-11-21 16:08:47 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-11-21 16:08:47 +0100 |
| commit | ee2deb69623ebf1489db3ef6ab493f682aefe2df (patch) | |
| tree | cc75b6c6a4c811e5f10fec1dcdd9f58ebd0b2b91 /php-pecl-swoole6.spec | |
| parent | 87a0f33effbe7d8e29dfcced9059d556ba65e242 (diff) | |
use 6.0.0-4 to workaround https://github.com/swoole/swoole-src/issues/5531
drop patch merged upstream
fix https://github.com/swoole/swoole-src/issues/5577 build with liburing < 2.6
using patch from https://github.com/swoole/swoole-src/pull/5579
Diffstat (limited to 'php-pecl-swoole6.spec')
| -rw-r--r-- | php-pecl-swoole6.spec | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/php-pecl-swoole6.spec b/php-pecl-swoole6.spec index 213730d..c7195ac 100644 --- a/php-pecl-swoole6.spec +++ b/php-pecl-swoole6.spec @@ -46,14 +46,16 @@ %bcond_without nghttpd2 %global upstream_version 6.0.0 -#global upstream_prever RC2 +%global upstream_prever RC1 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?scl_prefix}php-pecl-%{pecl_name}6 -Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +# Without prever, See https://github.com/swoole/swoole-src/issues/5531 +#Version: %%{upstream_version}%%{?upstream_prever:~%%{upstream_prever}} +Version: %{upstream_version} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # Extension is Apache-2.0 # BSD-3-Clause: Hiredis # MIT: nlohmann/json, nghttp2 @@ -61,7 +63,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: 5537.patch +Patch0: 5579.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -73,7 +75,6 @@ BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-sockets BuildRequires: %{?scl_prefix}php-mysqlnd BuildRequires: %{?scl_prefix}php-pdo -BuildRequires: pcre-devel BuildRequires: openssl-devel >= 1.0.2 BuildRequires: zlib-devel %if %{with curl} @@ -93,7 +94,7 @@ BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libnghttp2) %endif %if %{with uring} -BuildRequires: pkgconfig(liburing) +BuildRequires: pkgconfig(liburing) >= 2.5 %endif BuildRequires: pkgconfig(odbc) BuildRequires: pkgconfig(sqlite3) @@ -198,7 +199,7 @@ rm -r thirdparty/nghttp2 cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING %endif -%patch -P0 -p1 -b .pr5537 +%patch -P0 -p1 -b .pr5579 # Sanity check, really often broken extver=$(sed -n '/#define SWOOLE_VERSION /{s/.* "//;s/".*$//;p}' include/swoole_version.h) @@ -368,6 +369,13 @@ cd ../ZTS %changelog +* Thu Nov 21 2024 Remi Collet <remi@remirepo.net> - 6.0.0-4 +- update to 6.0.0RC1 +- use 6.0.0-4 to workaround https://github.com/swoole/swoole-src/issues/5531 +- drop patch merged upstream +- fix https://github.com/swoole/swoole-src/issues/5577 build with liburing < 2.6 + using patch from https://github.com/swoole/swoole-src/pull/5579 + * Tue Oct 22 2024 Remi Collet <remi@remirepo.net> - 6.0.0-3 - add fix for PHP 8.4 from https://github.com/swoole/swoole-src/pull/5537 |