From f19f3a22d6f8f060d0cb2f5a32a376adea0d21b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Feb 08 2019 07:52:27 +0000 Subject: update PEAR to 1.10.8 source generated from github tag drop patch merged upstream --- diff --git a/.gitignore b/.gitignore index 33b6401..2c5a8c8 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ clog /Archive_Tar-1.4.4.tgz /Archive_Tar-1.4.5.tgz /Console_Getopt-1.4.2.tgz +/PEAR-1.10.8.tgz 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 -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 8a3d305..0960f79 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -26,8 +26,8 @@ Summary: PHP Extension and Application Repository framework Name: 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+ @@ -47,8 +47,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: php(language) > 5.4 BuildRequires: php-cli @@ -221,7 +219,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 ? @@ -335,6 +333,11 @@ fi %changelog +* Fri Feb 8 2019 Remi Collet - 1:1.10.8-1 +- update PEAR to 1.10.8 +- source generated from github tag +- drop patch merged upstream + * Thu Feb 7 2019 Remi Collet - 1:1.10.7-5 - update Console_Getopt to 1.4.2 diff --git a/sources b/sources index 01b503b..f0bae07 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (Archive_Tar-1.4.5.tgz) = 7a7e16e37b0c7112a77333ed2c4d0a0ae57cc1e971191c79b1858227b46f967aee915757a81bdfef3a9487a53b81a99bfbe84f78a346671fe44ac9f1f203a358 SHA512 (Console_Getopt-1.4.2.tgz) = eb8ae099b423d37afaa41c50a2d8db1750de49b3b54872f26ac0ae9ae68b85d3dae936fe7cf0896e1ea80ad86b16fc8f60ac09593eb0d924009b25b3f67b1bdf -SHA512 (PEAR-1.10.7.tgz) = ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f +SHA512 (PEAR-1.10.8.tgz) = 21a3d3e09d18e20c0e03cae7f838977f2971114d096784afcdbfc9b94e4354a993ff4fcc4278562c982440db61aa318a882faabcaf03c3390ada0e3dbe03ffd4 SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833 SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 SHA512 (XML_Util-1.4.3.tgz) = c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310