summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO5
-rw-r--r--REFLECTION10
-rw-r--r--php-pecl-swoole6.spec69
3 files changed, 36 insertions, 48 deletions
diff --git a/PHPINFO b/PHPINFO
index b5a2b91..607a387 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,8 +3,8 @@ swoole
Swoole => enabled
Author => Swoole Team <team@swoole.com>
-Version => 6.2.0RC2
-Built => Mar 3 2026 00:00:00
+Version => 6.2.0
+Built => Mar 11 2026 00:00:00
host byte order => little endian
coroutine => enabled with boost asm context
trace_log => enabled
@@ -34,6 +34,7 @@ coroutine_pgsql => enabled
coroutine_odbc => enabled
coroutine_sqlite => enabled
coroutine_firebird => enabled
+io_uring => enabled
execinfo => enabled
Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 4c2179d..bb62db4 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 swoole version 6.2.0RC2 ] {
+Extension [ <persistent> extension #121 swoole version 6.2.0 ] {
- Dependencies {
Dependency [ json (Required) ]
@@ -41,13 +41,13 @@ Extension [ <persistent> extension #120 swoole version 6.2.0RC2 ] {
}
}
- - Constants [418] {
- Constant [ <persistent> string SWOOLE_VERSION ] { 6.2.0RC2 }
+ - Constants [420] {
+ Constant [ <persistent> string SWOOLE_VERSION ] { 6.2.0 }
Constant [ <persistent> int SWOOLE_VERSION_ID ] { 60200 }
Constant [ <persistent> int SWOOLE_MAJOR_VERSION ] { 6 }
Constant [ <persistent> int SWOOLE_MINOR_VERSION ] { 2 }
Constant [ <persistent> int SWOOLE_RELEASE_VERSION ] { 0 }
- Constant [ <persistent> string SWOOLE_EXTRA_VERSION ] { RC2 }
+ Constant [ <persistent> string SWOOLE_EXTRA_VERSION ] { }
Constant [ <persistent> bool SWOOLE_DEBUG ] { }
Constant [ <persistent> bool SWOOLE_HAVE_COMPRESSION ] { 1 }
Constant [ <persistent> bool SWOOLE_HAVE_ZLIB ] { 1 }
@@ -290,6 +290,8 @@ Extension [ <persistent> extension #120 swoole version 6.2.0RC2 ] {
Constant [ <persistent> int SWOOLE_IPC_UNIXSOCK ] { 1 }
Constant [ <persistent> int SWOOLE_IPC_SOCKET ] { 3 }
Constant [ <persistent> int SWOOLE_IOV_MAX ] { 1024 }
+ Constant [ <persistent> int SWOOLE_IOURING_DEFAULT ] { 0 }
+ Constant [ <persistent> int SWOOLE_IOURING_SQPOLL ] { 2 }
Constant [ <persistent> int SWOOLE_MUTEX ] { 3 }
Constant [ <persistent> int SWOOLE_RWLOCK ] { 1 }
Constant [ <persistent> int SWOOLE_SPINLOCK ] { 5 }
diff --git a/php-pecl-swoole6.spec b/php-pecl-swoole6.spec
index 0350178..0c13c91 100644
--- a/php-pecl-swoole6.spec
+++ b/php-pecl-swoole6.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-swoole6
#
-# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet
+# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
@@ -31,9 +31,8 @@
%global oraclemax 24
-%if 0%{?fedora} || 0%{?rhel} >= 9
-# See https://github.com/swoole/swoole-src/issues/6002
-%bcond_with uring
+%if 0%{?fedora} || 0%{?rhel} >= 11
+%bcond_without uring
%else
%bcond_with uring
%endif
@@ -55,26 +54,34 @@
%bcond_with ftp
%global upstream_version 6.2.0
-%global upstream_prever RC2
-%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
+#global upstream_prever RC2
+%global sources %{archivename}
%global _configure ../%{sources}/configure
+# Github forge
+%global gh_vend swoole
+%global gh_proj swoole-src
+%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
+%global tag v%{upstream_version}%{?upstream_prever}
+# for EL-8 to avoid TAG usage
+%global archivename %{gh_proj}-%{version}
+
Summary: PHP's asynchronous concurrent distributed networking framework
Name: %{?scl_prefix}php-pecl-%{pecl_name}6
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+%forgemeta
Release: 1%{?dist}
# Extension is Apache-2.0
# BSD-3-Clause: Hiredis
# MIT: nlohmann/json, nghttp2, llhttp
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
+URL: %{forgeurl}
+Source0: %{forgesource}
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?dtsprefix}gcc-c++
BuildRequires: (%{?scl_prefix}php-devel >= 8.2 with %{?scl_prefix}php-devel < 8.6)
-BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-curl
BuildRequires: %{?scl_prefix}php-json
BuildRequires: %{?scl_prefix}php-sockets
@@ -196,17 +203,6 @@ These are the files needed to compile programs using %{name}.
%prep
%setup -q -c
-# Don't install/register tests, install examples as doc
-sed \
- -e '/Makefile/s/role="doc"/role="src"/' \
- -e '/samples/s/role="doc"/role="src"/' \
- -e '/name="library/s/role="doc"/role="src"/' \
- -e '/php-cs-fix/s/role="doc"/role="src"/' \
- -e '/LICENSE/s/role="doc"/role="src"/' \
- -e '/COPYING/s/role="doc"/role="src"/' \
- -i package.xml
-
-
cd %{sources}
cp -p thirdparty/hiredis/COPYING hiredis-COPYING
%if %{with nghttpd2}
@@ -331,27 +327,15 @@ peclbuild %{__ztsphpconfig} --enable-swoole-thread
# install config file
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
%if %{with_zts}
%make_install -C ZTS
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
-# Test and Documentation
-cd %{sources}
-for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
-done
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
# code not compatible with Python 3
-rm %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/swoole_process/echo.py
-rm %{buildroot}%{pecl_docdir}/%{pecl_name}/examples/process/echo.py
+rm %{sources}/tests/swoole_process/echo.py
+rm %{sources}/examples/process/echo.py
%check
@@ -380,8 +364,7 @@ cd ../ZTS
%license %{sources}/LICENSE
%license %{sources}/*-COPYING
%license %{sources}/*-LICENSE
-%doc %{pecl_docdir}/%{pecl_name}/*md
-%{pecl_xmldir}/%{name}.xml
+%doc %{sources}/*.md
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
@@ -393,12 +376,9 @@ cd ../ZTS
%files devel
-%doc %{pecl_testdir}/%{pecl_name}
-%doc %{pecl_docdir}/%{pecl_name}/Dockerfile
-%doc %{pecl_docdir}/%{pecl_name}/docs
-%doc %{pecl_docdir}/%{pecl_name}/examples
-%doc %{pecl_docdir}/%{pecl_name}/gdbinit
-%doc %{pecl_docdir}/%{pecl_name}/thirdparty
+%doc %{sources}/docs
+%doc %{sources}/examples
+%doc %{sources}/tests
%{php_incldir}/ext/%{pecl_name}
%if %{with_zts}
@@ -407,6 +387,11 @@ cd ../ZTS
%changelog
+* Wed Mar 11 2026 Remi Collet <remi@remirepo.net> - 6.2.0-1
+- update to 6.2.0
+- drop pear/pecl dependency
+- sources from github
+
* Tue Mar 3 2026 Remi Collet <remi@remirepo.net> - 6.2.0~RC2-1
- update to 6.2.0RC2
- drop patch merged upstream