add fix for PHP 8.5.0alpha2 using upstream patchHEADmaster

re-license spec file to CECILL-2.1

2 files changed, 48 insertions, 42 deletions

diff --git a/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
new file mode 100644
index 0000000..2842ab5
--- /dev/null
+++ b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
@@ -0,0 +1,34 @@
+From 5bb707e3afa9520a5dab46567724a9fb495f63c5 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Thu, 17 Jul 2025 15:37:07 +0200
+Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default()
+
+---
+ php_stomp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/php_stomp.c b/php_stomp.c
+index 8a9a109..df04507 100644
+--- a/php_stomp.c
++++ b/php_stomp.c
+@@ -389,7 +389,7 @@ PHP_MINIT_FUNCTION(stomp)
+ 
+ 	/* Register StompException class */
+ 	INIT_CLASS_ENTRY(ce, PHP_STOMP_EXCEPTION_CLASSNAME, stomp_exception_methods);
+-	stomp_ce_exception = zend_register_internal_class_ex(&ce, zend_exception_get_default());
++	stomp_ce_exception = zend_register_internal_class_ex(&ce, zend_ce_exception);
+ 
+ 	/* Properties */
+ 	zend_declare_property_null(stomp_ce_exception, "details", sizeof("details")-1, ZEND_ACC_PRIVATE );
+@@ -1004,7 +1004,7 @@ PHP_FUNCTION(stomp_read_frame)
+ 				fcc.object = Z_OBJ_P(return_value);
+ 
+ 				if (zend_call_function(&fci, &fcc ) == FAILURE) {
+-					zend_throw_exception_ex(zend_exception_get_default(), 0 , "Could not execute %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(ce->constructor->common.function_name));
++					zend_throw_exception_ex(zend_ce_exception, 0 , "Could not execute %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(ce->constructor->common.function_name));
+ 				} else {
+ 					zval_ptr_dtor(&retval);
+ 				}
+-- 
+2.50.1
+
diff --git a/php-pecl-stomp.spec b/php-pecl-stomp.spec
index d5b6356..6394eab 100644
--- a/php-pecl-stomp.spec
+++ b/php-pecl-stomp.spec
@@ -1,8 +1,8 @@
 # remimrepo/fedora spec file for php-pecl-stomp
 #
-# Copyright (c) 2014-2023 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2014-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -21,11 +21,13 @@
 Summary:        Stomp client extension
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        2.0.3
-Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP-3.01
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{sources}.tgz
 
+Patch0:         0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch
+
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  make
 BuildRequires:  %{?scl_prefix}php-devel >= 7.0
@@ -47,22 +49,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.3"
-Obsoletes:     php73-pecl-%{pecl_name}  <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes:     php81-pecl-%{pecl_name}  <= %{version}
-%endif
-%endif
-
 
 %description
 This extension allows php applications to communicate with any
@@ -79,10 +65,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 cd %{sources}
+%patch -P0 -p1
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_STOMP_VERSION/{s/.* "//;s/".*$//;p}' php_stomp.h)
 if test "x${extver}" != "x%{version}%{?versuf}"; then
@@ -160,26 +148,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
 %check
 # Upstream test suite requires a Stomp server
 
@@ -223,7 +191,7 @@ exit $ret
 
 
 %files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -237,6 +205,10 @@ exit $ret
 
 
 %changelog
+* Thu Jul 17 2025 Remi Collet <remi@remirepo.net> - 2.0.3-4
+- add fix for PHP 8.5.0alpha2 using upstream patch
+- re-license spec file to CECILL-2.1
+
 * Mon Sep  4 2023 Remi Collet <remi@remirepo.net> - 2.0.3-3
 - build out of sources tree