From 3bc96772fc3ee55730b11773be306d0413d524d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 13 May 2024 10:57:39 +0200
Subject: refresh sources

drop patch merged upstream
---
 5239.patch            | 34 ----------------------------------
 php-pecl-swoole5.spec | 10 +++++-----
 2 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 5239.patch

diff --git a/5239.patch b/5239.patch
deleted file mode 100644
index 31a61c4..0000000
--- a/5239.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e7c56d9842d17df0647d8e87251a2f70f06cde63 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 24 Jan 2024 09:56:17 +0100
-Subject: [PATCH] Fix out of sources tree build
-
----
- config.m4 | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/config.m4 b/config.m4
-index 2e8c166021..d68d06b6df 100644
---- a/config.m4
-+++ b/config.m4
-@@ -1009,14 +1009,19 @@ EOF
-         AC_DEFINE(SW_USE_MYSQLND, 1, [use mysqlnd])
-     fi
- 
--    if test -f "ext-src/php_swoole.cc"; then
-+    AC_MSG_CHECKING([for sources])
-+    if test -f "$abs_srcdir/ext-src/php_swoole.cc"; then
-+        swoole_source_dir=$abs_srcdir
-+    elif test -f "ext-src/php_swoole.cc"; then
-         swoole_source_dir=$(pwd)
-     else
-         swoole_source_dir="ext/swoole"
-     fi
-+    AC_MSG_RESULT([$swoole_source_dir])
- 
-     ext_src_files=$(cd $swoole_source_dir && find ext-src/ -name *.cc)
-     lib_src_files=$(cd $swoole_source_dir && find src/ -name *.cc)
-+
-     swoole_source_file="${ext_src_files} ${lib_src_files}"
- 
-     swoole_source_file="$swoole_source_file \
diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec
index 2191a6e..5ff68b4 100644
--- a/php-pecl-swoole5.spec
+++ b/php-pecl-swoole5.spec
@@ -62,7 +62,7 @@
 Summary:        PHP's asynchronous concurrent distributed networking framework
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}5
 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 Apache-2.0
 # BSD-3-Clause: Hiredis
 # MIT: nlohmann/json, nghttp2
@@ -70,8 +70,6 @@ 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:         https://patch-diff.githubusercontent.com/raw/swoole/swoole-src/pull/5239.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?dtsprefix}gcc-c++
@@ -191,8 +189,6 @@ sed \
 
 
 cd %{sources}
-%patch -P0 -p1 -b .out
-
 cp -p thirdparty/hiredis/COPYING hiredis-COPYING
 %if %{with nghttpd2}
 rm -r thirdparty/nghttp2
@@ -385,6 +381,10 @@ cd ../ZTS
 
 
 %changelog
+* Mon May 13 2024 Remi Collet <remi@remirepo.net> - 5.1.2-2
+- refresh sources
+- drop patch merged upstream
+
 * Wed Jan 24 2024 Remi Collet <remi@remirepo.net> - 5.1.2-1
 - update to 5.1.2
 - fix out of sources tree build using patch from
-- 
cgit