From fc2e2e8f7cf118a772ca7a22debf9492db02a36e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 23 Aug 2018 06:44:32 +0200
Subject: update PEAR to 1.10.6

---
 71.patch      | 23 -----------------------
 php-pear.spec | 12 ++++++------
 2 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 71.patch

diff --git a/71.patch b/71.patch
deleted file mode 100644
index 88da655..0000000
--- a/71.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c5f321f171783c1b088490dcaf39b0aad5eb5c13 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 12 Oct 2017 09:35:57 +0200
-Subject: [PATCH] fix  Warning: count(): Parameter must be an array or an
- object that implements Countable in PEAR/RunTest.php on line 346
-
----
- PEAR/RunTest.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php
-index 8eabac3c3..482beccb3 100644
---- a/PEAR/RunTest.php
-+++ b/PEAR/RunTest.php
-@@ -343,7 +343,7 @@ function run($file, $ini_settings = array(), $test_number = 1)
- 
-         // Check if test should be skipped.
-         $res  = $this->_runSkipIf($section_text, $temp_skipif, $tested, $ini_settings);
--        if (count($res) != 2) {
-+        if ($res == 'SKIPPED' || count($res) != 2) {
-             return $res;
-         }
-         $info = $res['info'];
diff --git a/php-pear.spec b/php-pear.spec
index cfd916c..90e86eb 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -39,8 +39,8 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: %{?scl_prefix}php-pear
-Version: 1.10.5
-Release: 8%{?dist}
+Version: 1.10.6
+Release: 1%{?dist}
 Epoch: 1
 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
@@ -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
 
-# https://github.com/pear/pear-core/pull/71
-Patch0:   https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/71.patch
-
 BuildArch: noarch
 BuildRequires: %{?scl_prefix}php(language) > 5.4
 BuildRequires: %{?scl_prefix}php-cli
@@ -279,7 +276,7 @@ install -m 644 -D macros.pear \
 
 # apply patches on installed PEAR tree
 pushd %{buildroot}%{peardir}
-patch --no-backup --fuzz 0 -p1 < %{PATCH0}
+: no patch
 popd
 
 # Why this file here ?
@@ -465,6 +462,9 @@ fi
 
 
 %changelog
+* Thu Aug 23 2018 Remi Collet <remi@remirepo.net> - 1:1.10.6-1
+- update PEAR to 1.10.6
+
 * Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 1:1.10.5-8
 - require /usr/bin/gpg instead of gnupg
 
-- 
cgit