diff options
| author | Remi Collet <remi@remirepo.net> | 2024-10-22 08:06:16 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-10-22 08:06:16 +0200 |
| commit | 8a1555bc0cdde4cab24dc57bb0a1bb4d0023dc9e (patch) | |
| tree | 29cb568042d13dbbbac8489f37a7f3272375e195 | |
| parent | ce626619c29516712e060531ae1be20ae0372276 (diff) | |
| -rw-r--r-- | PHPINFO | 6 | ||||
| -rw-r--r-- | REFLECTION | 8 | ||||
| -rw-r--r-- | php-pecl-swoole5.spec | 27 |
3 files changed, 21 insertions, 20 deletions
@@ -3,8 +3,8 @@ swoole Swoole => enabled Author => Swoole Team <team@swoole.com> -Version => 5.1.4 -Built => Aug 26 2024 00:00:00 +Version => 5.1.5 +Built => Oct 22 2024 00:00:00 coroutine => enabled with boost asm context trace_log => enabled epoll => enabled @@ -14,7 +14,7 @@ cpu_affinity => enabled spinlock => enabled rwlock => enabled sockets => enabled -openssl => OpenSSL 3.1.1 30 May 2023 +openssl => OpenSSL 3.1.4 24 Oct 2023 dtls => enabled http2 => enabled json => enabled @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #96 swoole version 5.1.4 ] { +Extension [ <persistent> extension #125 swoole version 5.1.5 ] { - Dependencies { Dependency [ json (Required) ] @@ -33,11 +33,11 @@ Extension [ <persistent> extension #96 swoole version 5.1.4 ] { } - Constants [421] { - Constant [ string SWOOLE_VERSION ] { 5.1.4 } - Constant [ int SWOOLE_VERSION_ID ] { 50104 } + Constant [ string SWOOLE_VERSION ] { 5.1.5 } + Constant [ int SWOOLE_VERSION_ID ] { 50105 } Constant [ int SWOOLE_MAJOR_VERSION ] { 5 } Constant [ int SWOOLE_MINOR_VERSION ] { 1 } - Constant [ int SWOOLE_RELEASE_VERSION ] { 4 } + Constant [ int SWOOLE_RELEASE_VERSION ] { 5 } Constant [ string SWOOLE_EXTRA_VERSION ] { } Constant [ bool SWOOLE_DEBUG ] { } Constant [ bool SWOOLE_HAVE_COMPRESSION ] { 1 } diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec index 1f1ff6c..03e2bd5 100644 --- a/php-pecl-swoole5.spec +++ b/php-pecl-swoole5.spec @@ -39,7 +39,7 @@ %bcond_without curl %bcond_without nghttpd2 -%global upstream_version 5.1.4 +%global upstream_version 5.1.5 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -58,7 +58,8 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upst BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ -BuildRequires: %{?scl_prefix}php-devel >= 8.0 +# See https://github.com/swoole/swoole-src/issues/5534 +BuildRequires: (%{?scl_prefix}php-devel >= 8.0 with %{?scl_prefix}php-devel < 8.4) BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-curl BuildRequires: %{?scl_prefix}php-json @@ -168,8 +169,8 @@ sed \ -e '/Makefile/s/role="doc"/role="src"/' \ -e '/samples/s/role="doc"/role="src"/' \ -e '/name="library/s/role="doc"/role="src"/' \ - %{?_licensedir: -e '/LICENSE/s/role="doc"/role="src"/' } \ - %{?_licensedir: -e '/COPYING/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ + -e '/COPYING/s/role="doc"/role="src"/' \ -i package.xml @@ -247,11 +248,12 @@ peclbuild() { --with-libdir=%{_lib} \ --with-php-config=$1 -make %{?_smp_mflags} +%make_build } cd %{sources} %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global cd ../NTS peclbuild %{__phpconfig} @@ -265,8 +267,7 @@ peclbuild %{__ztsphpconfig} %install %{?dtsenable} -make -C NTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -275,8 +276,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make -C ZTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -317,10 +317,8 @@ cd ../ZTS %files -%{?_licensedir:%license %{sources}/LICENSE} -%{?_licensedir:%license %{sources}/*-COPYING} -%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/LICENSE} -%{!?_licensedir:%{pecl_docdir}/%{pecl_name}/thirdparty/*/COPYING} +%license %{sources}/LICENSE +%license %{sources}/*-COPYING %doc %{pecl_docdir}/%{pecl_name}/*md %{pecl_xmldir}/%{name}.xml @@ -348,6 +346,9 @@ cd ../ZTS %changelog +* Tue Oct 22 2024 Remi Collet <remi@remirepo.net> - 5.1.5-1 +- update to 5.1.5 + * Mon Aug 26 2024 Remi Collet <remi@remirepo.net> - 5.1.4-1 - update to 5.1.4 - drop patch merged upstream |