diff options
| -rw-r--r-- | 83.patch | 22 | ||||
| -rw-r--r-- | php-pear.spec | 13 |
2 files changed, 32 insertions, 3 deletions
diff --git a/83.patch b/83.patch new file mode 100644 index 0000000..db41ef8 --- /dev/null +++ b/83.patch @@ -0,0 +1,22 @@ +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 f3df1fc..aff6c84 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -20,7 +20,7 @@ %global metadir %{_localstatedir}/lib/pear %global getoptver 1.4.1 -%global arctarver 1.4.3 +%global arctarver 1.4.4 # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address %global structver 1.1.1 @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.7 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -62,6 +62,8 @@ 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 @@ -277,7 +279,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -: no patch +patch -p1 <%{PATCH0} popd # Why this file here ? @@ -463,6 +465,11 @@ fi %changelog +* Fri Dec 21 2018 Remi Collet <remi@remirepo.net> - 1:1.10.7-3 +- update Archive_Tar to 1.4.4 +- drop PHP 7.2 deprecated option, patch from + https://github.com/pear/pear-core/pull/83 + * Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 1:1.10.7-2 - EL-8 build with autoloader |