From fd227d7195365a73be994c359ddae2702ecd9ddf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 3 Aug 2023 07:57:55 +0200
Subject: update to 2.0.0beta1

fix segfault in test suite using patch from
  https://github.com/php-amqp/php-amqp/pull/455
---
 php-pecl-amqp.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'php-pecl-amqp.spec')

diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index 0994658..da57f28 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -18,7 +18,7 @@
 %global pecl_name   amqp
 %global ini_name    40-%{pecl_name}.ini
 %global upstream_version 2.0.0
-%global upstream_prever  alpha2
+%global upstream_prever  beta1
 %global upstream_lower   %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]')
 %global sources     %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure  ../%{sources}/configure
@@ -33,6 +33,8 @@ License:       PHP-3.01
 URL:           https://pecl.php.net/package/amqp
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
+Patch0:        %{pecl_name}-pr455.patch
+
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.4
@@ -94,6 +96,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
+%patch -P0 -p1
+
 # Upstream often forget to change this
 extver=$(sed -n '/#define PHP_AMQP_VERSION /{s/.* "//;s/".*$//;p}' php_amqp_version.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -225,9 +229,6 @@ export RABBITMQ_MNESIA_BASE=$PWD/base
 ret=0
 pushd %{sources}
 
-# https://github.com/php-amqp/php-amqp/issues/448
-rm tests/amqpconnection_tls*.phpt
-
 : Run the upstream test Suite for NTS extension
 TEST_PHP_ARGS="-n -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
@@ -279,6 +280,11 @@ fi
 
 
 %changelog
+* Thu Aug  3 2023 Remi Collet <remi@remirepo.net> - 2.0.0~beta1-1
+- update to 2.0.0beta1
+- fix segfault in test suite using patch from
+  https://github.com/php-amqp/php-amqp/pull/455
+
 * Mon Jul 31 2023 Remi Collet <remi@remirepo.net> - 2.0.0~alpha2-1
 - update to 2.0.0alpha2
 - open https://github.com/php-amqp/php-amqp/issues/448 missing file
-- 
cgit