rpms/php-pear
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update PEAR to 1.10.6

Browse Source
This commit is contained in:
Remi Collet 2018-08-23 07:10:34 +02:00
parent aa41ef1782
commit 0b11a551a9
4 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -40,3 +40,4 @@ clog
/Archive_Tar-1.4.3.tgz /Archive_Tar-1.4.3.tgz
/PEAR-1.10.5.tgz /PEAR-1.10.5.tgz
/XML_Util-1.4.3.tgz /XML_Util-1.4.3.tgz
/PEAR-1.10.6.tgz

23
71.patch
View File

@ -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'];

12
php-pear.spec
View File

@ -26,8 +26,8 @@
Summary: PHP Extension and Application Repository framework Summary: PHP Extension and Application Repository framework
Name: php-pear Name: php-pear
Version: 1.10.5 Version: 1.10.6
Release: 9%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
# Structures_Graph is LGPLv3+ # Structures_Graph is LGPLv3+
@ -48,9 +48,6 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.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 BuildArch: noarch
BuildRequires: php(language) > 5.4 BuildRequires: php(language) > 5.4
BuildRequires: php-cli BuildRequires: php-cli
@ -223,7 +220,7 @@ install -m 644 -D macros.pear \
# apply patches on installed PEAR tree # apply patches on installed PEAR tree
pushd %{buildroot}%{peardir} pushd %{buildroot}%{peardir}
patch --no-backup --fuzz 0 -p1 < %{PATCH0} : no patch
popd popd
# Why this file here ? # Why this file here ?
@ -337,6 +334,9 @@ fi
%changelog %changelog
* Thu Aug 23 2018 Remi Collet <remi@remirepo.net> - 1:1.10.6-1
- update PEAR to 1.10.6
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.5-9 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

2
sources
View File

@ -1,6 +1,6 @@
SHA512 (Archive_Tar-1.4.3.tgz) = 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c SHA512 (Archive_Tar-1.4.3.tgz) = 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c
SHA512 (Console_Getopt-1.4.1.tgz) = cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd SHA512 (Console_Getopt-1.4.1.tgz) = cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd
SHA512 (PEAR-1.10.5.tgz) = c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364 SHA512 (PEAR-1.10.6.tgz) = ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833 SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833
SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
SHA512 (XML_Util-1.4.3.tgz) = c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310 SHA512 (XML_Util-1.4.3.tgz) = c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310