From e7da80887e59308367d7bf6a102f88ffc0356967 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 27 Nov 2023 07:23:29 +0100
Subject: update to 1.10.14

drop patches merged upstream
---
 pear-php82.patch | 44 --------------------------------------------
 php-pear.spec    | 15 ++++++++-------
 2 files changed, 8 insertions(+), 51 deletions(-)
 delete mode 100644 pear-php82.patch

diff --git a/pear-php82.patch b/pear-php82.patch
deleted file mode 100644
index b9f9ff8..0000000
--- a/pear-php82.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
-From 5a8e7eccdaa577af8ae816e60819c14669c33376 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 23 Nov 2023 10:46:14 +0100
-Subject: [PATCH] fix Using ${var} in strings is deprecated
-
----
- PEAR/Installer.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/PEAR/Installer.php b/PEAR/Installer.php
-index c6e4a99fc..e7f5ce107 100644
---- a/PEAR/Installer.php
-+++ b/PEAR/Installer.php
-@@ -1271,7 +1271,7 @@ function install($pkgfile, $options = array())
-                 if (count($test)) {
-                     $msg = "$channel/$pkgname: conflicting files found:\n";
-                     $longest = max(array_map("strlen", array_keys($test)));
--                    $fmt = "%${longest}s (%s)\n";
-+                    $fmt = "%{$longest}s (%s)\n";
-                     foreach ($test as $file => $info) {
-                         if (!is_array($info)) {
-                             $info = array('pear.php.net', $info);
diff --git a/php-pear.spec b/php-pear.spec
index 99cee34..af0caf5 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -39,12 +39,12 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: %{?scl_prefix}php-pear
-Version: 1.10.13
-Release: 7%{?dist}
+Version: 1.10.14
+Release: 1%{?dist}
 Epoch: 1
 # BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt
 # BSD-3-Clause: XML_Util
-# LGPL-3.0-or-later: Structures_Graph is LGPLv3+
+# LGPL-3.0-or-later: Structures_Graph
 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
@@ -62,9 +62,6 @@ 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
@@ -283,7 +280,7 @@ install -m 644 -D macros.pear \
 
 # apply patches on installed PEAR tree
 pushd %{buildroot}%{peardir}
-  patch -p1 <%{PATCH0}
+  : none
 popd
 
 # Why this file here ?
@@ -468,6 +465,10 @@ fi
 
 
 %changelog
+* Mon Nov 27 2023 Remi Collet <remi@remirepo.net> - 1.10.14-1
+- update to 1.10.14
+- drop patches merged upstream
+
 * Thu Nov 23 2023 Remi Collet <remi@remirepo.net> - 1.10.13-7
 - fix more deprecations from
   https://github.com/pear/pear-core/pull/127
-- 
cgit