From fb719003943a81f5b8ffbda671f772aac717fcf0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Mar 2020 16:42:46 +0200 Subject: add patch for PEAR and PHP 7.4 from https://github.com/pear/pear-core/pull/103 --- php-pear.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'php-pear.spec') diff --git a/php-pear.spec b/php-pear.spec index e8e0424..b3e4f3e 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.10 -Release: 5%{?dist} +Release: 7%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -62,6 +62,7 @@ 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/XML_Util/pull/12.patch +Patch1: https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/103.patch BuildArch: noarch BuildRequires: %{?scl_prefix}php(language) > 5.4 @@ -280,6 +281,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} patch -p1 < %{PATCH0} +patch -p1 < %{PATCH1} popd # Why this file here ? @@ -464,6 +466,10 @@ fi %changelog +* Mon Mar 30 2020 Remi Collet - 1:1.10.10-7 +- add patch for PEAR and PHP 7.4 from + https://github.com/pear/pear-core/pull/103 + * Thu Dec 12 2019 Remi Collet - 1:1.10.10-5 - add patch for XML_Util and PHP 7.4 from https://github.com/pear/XML_Util/pull/12 -- cgit