diff options
| author | Remi Collet <remi@remirepo.net> | 2022-09-15 10:03:57 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2022-09-15 10:03:57 +0200 |
| commit | a028a8791bbc1740df187a0227a24c4465df37ff (patch) | |
| tree | 7986bb1f49893d74932991215acd99967847ff97 | |
| parent | 104e3bb5d07732866c422b5fb7ee9aa2d7ae8544 (diff) | |
add upstream patch for PHP 8.2
| -rw-r--r-- | php-pecl-xmlrpc.spec | 26 | ||||
| -rw-r--r-- | xmlrpc-php82.patch | 24 |
2 files changed, 34 insertions, 16 deletions
diff --git a/php-pecl-xmlrpc.spec b/php-pecl-xmlrpc.spec index 809b669..6ee4d69 100644 --- a/php-pecl-xmlrpc.spec +++ b/php-pecl-xmlrpc.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-xmlrpc # -# Copyright (c) 2020-2021 Remi Collet +# Copyright (c) 2020-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,7 +11,6 @@ %undefine _strict_symbol_defs_build %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-pecl-xmlrpc %endif @@ -31,9 +30,9 @@ %global ini_name 30-%{pecl_name}.ini Summary: Functions to write XML-RPC servers and clients -Name: %{?sub_prefix}php-pecl-%{pecl_name} +Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -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 PHP # Library is BSD @@ -45,6 +44,8 @@ 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}-php82.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.0 @@ -62,18 +63,6 @@ Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -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 -Obsoletes: php80-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "8.1" -Obsoletes: php81-pecl-%{pecl_name} <= %{version} -%endif -%endif %description @@ -103,6 +92,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .up + # 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 @@ -214,6 +205,9 @@ TEST_PHP_ARGS="-n -d extension=xml -d extension=%{buildroot}%{php_extdir}/%{pecl %changelog +* Thu Sep 15 2022 Remi Collet <remi@remirepo.net> - 1.0.0~rc3-2 +- add upstream patch for PHP 8.2 + * Mon Dec 6 2021 Remi Collet <remi@remirepo.net> - 1.0.0~rc3-1 - update to 1.0.0RC3 (beta) diff --git a/xmlrpc-php82.patch b/xmlrpc-php82.patch new file mode 100644 index 0000000..a7c89c4 --- /dev/null +++ b/xmlrpc-php82.patch @@ -0,0 +1,24 @@ +From e83ef297bb23cc4e4de2cfb4bc83433902a196ef Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Thu, 15 Sep 2022 09:59:00 +0200 +Subject: [PATCH] fix test using dynamic properties + +--- + tests/bug74975.phpt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/bug74975.phpt b/tests/bug74975.phpt +index 1b35298..7d50036 100644 +--- a/tests/bug74975.phpt ++++ b/tests/bug74975.phpt +@@ -7,6 +7,7 @@ if (!extension_loaded("xmlrpc")) print "skip"; + --FILE-- + <?php + ++#[AllowDynamicProperties] + class Foo { + + } +-- +2.37.2 + |