Changes of Revision 2
| [-] | Changed | php-pear.changes |
|
x 1 2 -------------------------------------------------------------------3 +Mon Mar 19 15:20:24 UTC 2018 - cs@linux-administrator.com4 +5 +- update PEAR to 1.10.56 +- update XML_Util to 1.4.37 +- update Archive_Tar to 1.4.38 +9 +-------------------------------------------------------------------10 Thu Aug 18 13:27:09 UTC 2016 - cs@linux-administrator.com11 12 - initial import13 |
||
| [-] | Changed | php-pear.spec ^ |
|
45 1 2 %global metadir %{_localstatedir}/lib/pear3 4 %global getoptver 1.4.15 -%global arctarver 1.4.26 +%global arctarver 1.4.37 # https://pear.php.net/bugs/bug.php?id=193678 # Structures_Graph 1.0.4 - incorrect FSF address9 %global structver 1.1.110 -%global xmlutil 1.3.011 +%global xmlutil 1.4.312 %global manpages 1.10.013 14 # Tests are only run with rpmbuild --with tests15 16 17 Summary: PHP Extension and Application Repository framework18 Name: %{?scl_prefix}php-pear19 -Version: 1.10.120 +Version: 1.10.521 Release: 6%{?dist}22 Epoch: 123 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD24 25 Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz26 Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz27 28 +# https://github.com/pear/pear-core/pull/7129 +Patch0: https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/71.patch30 +31 BuildArch: noarch32 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)33 BuildRequires: %{?scl_prefix}php(language) > 5.434 35 $RPM_BUILD_ROOT%{macrosdir}/macros.%{?scl_prefix}pear36 37 # apply patches on installed PEAR tree38 -pushd $RPM_BUILD_ROOT%{peardir} 39 -# none40 +pushd %{buildroot}%{peardir}41 +patch --no-backup --fuzz 0 -p1 < %{PATCH0}42 popd43 44 # Why this file here ?45 |
||
| [+] | Added | 71.patch ^ |
| @@ -0,0 +1,23 @@ +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']; | ||
| Added | Archive_Tar-1.4.3.tgz ^ | |
| Added | PEAR-1.10.5.tgz ^ | |
| Added | XML_Util-1.4.3.tgz ^ | |