From a06d08a1e856bafda2cb2f1c89b7840d977c3251 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 8 Feb 2019 08:40:42 +0100
Subject: update PEAR to 1.10.8 source generated from github tag

---
 83.patch      | 22 ----------------------
 php-pear.spec | 12 +++++++-----
 2 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 83.patch

diff --git a/83.patch b/83.patch
deleted file mode 100644
index db41ef8..0000000
--- a/83.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From fe2a8caae5ed69e268d8ff7a3a17c666960a9d04 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 21 Dec 2018 08:19:34 +0100
-Subject: [PATCH] Drop track_errors from options, as this may raise
- E_DEPRECATED warning and thus make test suite fail
-
----
- PEAR/RunTest.php | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php
-index 482beccb3..af9113ab9 100644
---- a/PEAR/RunTest.php
-+++ b/PEAR/RunTest.php
-@@ -64,7 +64,6 @@ class PEAR_RunTest
-         'display_errors=1',
-         'log_errors=0',
-         'html_errors=0',
--        'track_errors=1',
-         'report_memleaks=0',
-         'report_zend_debug=0',
-         'docref_root=',
diff --git a/php-pear.spec b/php-pear.spec
index 5837154..a544069 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.7
-Release: 5%{?dist}
+Version: 1.10.8
+Release: 1%{?dist}
 Epoch: 1
 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
@@ -61,8 +61,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
 
-Patch0:   https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/83.patch
-
 BuildArch: noarch
 BuildRequires: %{?scl_prefix}php(language) > 5.4
 BuildRequires: %{?scl_prefix}php-cli
@@ -278,7 +276,7 @@ install -m 644 -D macros.pear \
 
 # apply patches on installed PEAR tree
 pushd %{buildroot}%{peardir}
-patch -p1 <%{PATCH0}
+: no patch
 popd
 
 # Why this file here ?
@@ -464,6 +462,10 @@ fi
 
 
 %changelog
+* Fri Feb  8 2019 Remi Collet <remi@remirepo.net> - 1:1.10.8-1
+- update PEAR to 1.10.8
+- source generated from github tag
+
 * Thu Feb  7 2019 Remi Collet <remi@remirepo.net> - 1:1.10.7-5
 - update Console_Getopt to 1.4.2
 
-- 
cgit