diff options
| -rw-r--r-- | pear-php82.patch | 22 | ||||
| -rw-r--r-- | php-pear.spec | 31 |
2 files changed, 45 insertions, 8 deletions
diff --git a/pear-php82.patch b/pear-php82.patch new file mode 100644 index 0000000..a8d6bcb --- /dev/null +++ b/pear-php82.patch @@ -0,0 +1,22 @@ +From 4217e3ea503ba6c0651ea2d182fb9cb88f21ce0b Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 20 Feb 2023 16:02:34 +0100 +Subject: [PATCH] Fix: Creation of dynamic property PEAR_Error::$callback is + deprecated + +--- + PEAR.php | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/PEAR.php b/PEAR.php +index fee6638f4..6dba3b010 100644 +--- a/PEAR.php ++++ b/PEAR.php +@@ -859,6 +859,7 @@ class PEAR_Error + var $message = ''; + var $userinfo = ''; + var $backtrace = null; ++ var $callback = null; + + /** + * PEAR_Error constructor diff --git a/php-pear.spec b/php-pear.spec index 9c1143f..f29b3a0 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -20,7 +20,7 @@ %global metadir %{_localstatedir}/lib/pear %global getoptver 1.4.3 -%global arctarver 1.4.13 +%global arctarver 1.4.14 # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address %global structver 1.1.1 @@ -39,12 +39,13 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear -Version: 1.10.12 -Release: 8%{?dist} +Version: 1.10.13 +Release: 5%{?dist} Epoch: 1 -# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD -# Structures_Graph is LGPLv3+ -License: BSD and LGPLv3+ +# BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt +# BSD-3-Clause: XML_Util +# LGPL-3.0-or-later: Structures_Graph is LGPLv3+ +License: BSD-2-Clause AND BSD-3-Clause AND LGPL-3.0-or-later URL: http://pear.php.net/package/PEAR Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz # wget https://raw.githubusercontent.com/pear/pear-core/stable/install-pear.php @@ -61,6 +62,9 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz +# Fix PHP 8.2 deprecations +Patch0: pear-php82.patch + BuildArch: noarch BuildRequires: %{?scl_prefix}php(language) > 5.4 BuildRequires: %{?scl_prefix}php-cli @@ -279,11 +283,11 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -: no patch + patch -p1 <%{PATCH0} popd # Why this file here ? -rm -rf %{buildroot}/.depdb* %{buildroot}/.lock %{buildroot}/.channels $RPM_BUILD_ROOT/.filemap +rm -rf %{buildroot}/.depdb* %{buildroot}/.lock %{buildroot}/.channels %{buildroot}/.filemap # Need for re-registrying XML_Util install -pm 644 *.xml %{buildroot}%{_localstatedir}/lib/pear/pkgxml @@ -464,6 +468,17 @@ fi %changelog +* Mon Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.10.13-5 +- fix PHP 8.2 deprecations using patch from + https://github.com/pear/pear-core/pull/124 +- use SPDX license IDs + +* Wed Aug 11 2021 Remi Collet <remi@remirepo.net> - 1.10.13-1 +- update to 1.10.13 + +* Wed Jul 21 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-9 +- update Archive_Tar to 1.4.14 + * Fri Jun 18 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-8 - fedora/autoloader is optional |