summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-pecl-xmlrpc.spec16
-rw-r--r--xmlrpc-php81.patch30
2 files changed, 6 insertions, 40 deletions
diff --git a/php-pecl-xmlrpc.spec b/php-pecl-xmlrpc.spec
index 1d94b1d..809b669 100644
--- a/php-pecl-xmlrpc.spec
+++ b/php-pecl-xmlrpc.spec
@@ -25,15 +25,15 @@
%global pecl_name xmlrpc
%global with_tests 0%{!?_without_tests:1}
%global upver 1.0.0
-%global rcver RC2
-%global lower rc2
+%global rcver RC3
+%global lower rc3
# After 20-xml
%global ini_name 30-%{pecl_name}.ini
Summary: Functions to write XML-RPC servers and clients
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
# Extension is PHP
# Library is BSD
@@ -45,8 +45,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
Source0: https://pecl.php.net/get/%{pecl_name}-%{upver}%{?rcver}.tgz
%endif
-Patch0: %{pecl_name}-php81.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 8.0
@@ -105,8 +103,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .php81
-
# Check version as upstream often forget to update this
extver=$(sed -n '/#define PHP_XMLRPC_VERSION/{s/.* "//;s/".*$//;p}' php_xmlrpc.h)
if test "x${extver}" != "x%{upver}%{?rcver}%{?gh_date:-dev}"; then
@@ -196,10 +192,7 @@ cd ../ZTS
cd ../NTS
: Run upstream test suite
-TEST_PHP_EXECUTABLE=%{__php} \
TEST_PHP_ARGS="-n -d extension=xml -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
%{__php} -n run-tests.php -q --show-diff
%endif
@@ -221,6 +214,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Mon Dec 6 2021 Remi Collet <remi@remirepo.net> - 1.0.0~rc3-1
+- update to 1.0.0RC3 (beta)
+
* Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 1.0.0~rc2-3
- rebuild for 8.1.0RC1
diff --git a/xmlrpc-php81.patch b/xmlrpc-php81.patch
deleted file mode 100644
index f08b9c4..0000000
--- a/xmlrpc-php81.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0f782ffe52cebd0a65356427b7ab72d48b72d20c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 22 Jul 2021 12:59:04 +0200
-Subject: [PATCH] Fix #1 compatibility with 8.1.0beta1
-
----
- .gitignore | 1 +
- xmlrpc-epi-php.c | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xmlrpc-epi-php.c b/xmlrpc-epi-php.c
-index e3120b8..2d0b367 100644
---- a/xmlrpc-epi-php.c
-+++ b/xmlrpc-epi-php.c
-@@ -227,10 +227,14 @@ PHP_MINIT_FUNCTION(xmlrpc)
- zend_class_entry ce;
- INIT_CLASS_ENTRY(ce, "XmlRpcServer", class_XmlRpcServer_methods);
- xmlrpc_server_ce = zend_register_internal_class(&ce);
-- xmlrpc_server_ce->ce_flags |= ZEND_ACC_FINAL;
- xmlrpc_server_ce->create_object = xmlrpc_server_create_object;
-+#if PHP_VERSION_ID < 80100
- xmlrpc_server_ce->serialize = zend_class_serialize_deny;
- xmlrpc_server_ce->unserialize = zend_class_unserialize_deny;
-+ xmlrpc_server_ce->ce_flags |= ZEND_ACC_FINAL;
-+#else
-+ xmlrpc_server_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
-
- memcpy(&xmlrpc_server_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
- xmlrpc_server_object_handlers.offset = XtOffsetOf(xmlrpc_server_data, std);