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

add patch for PEAR and PHP 7.4 from

Browse Source 
https://github.com/pear/pear-core/pull/103
This commit is contained in:
Remi Collet 2020-03-30 16:55:03 +02:00
parent 93d1d465bd
commit c65155e432
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
103.patch Normal file
View File

@ -0,0 +1,25 @@
From 76e3fae5072624639045a15fbe88d22e198ad649 Mon Sep 17 00:00:00 2001
From: Damon <damon.tu@outlook.com>
Date: Fri, 29 Nov 2019 10:44:05 +0800
Subject: [PATCH] Fix undefined constant name
---
PEAR/Builder.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PEAR/Builder.php b/PEAR/Builder.php
index a7b464341..bfc2ca221 100644
--- a/PEAR/Builder.php
+++ b/PEAR/Builder.php
@@ -402,9 +402,9 @@ function build($descfile, $callback = null)
}
if (substr($option['name'], 0, 5) === 'with-' &&
($response === 'yes' || $response === 'autodetect')) {
- $configure_command .= " --{$option[name]}";
+ $configure_command .= " --{$option['name']}";
} else {
- $configure_command .= " --{$option[name]}=".trim($response);
+ $configure_command .= " --{$option['name']}=".trim($response);
}
}
}

8
php-pear.spec
View File

@ -27,7 +27,7 @@
Summary: PHP Extension and Application Repository framework Summary: PHP Extension and Application Repository framework
Name: php-pear Name: php-pear
Version: 1.10.10 Version: 1.10.10
Release: 6%{?dist} Release: 7%{?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,6 +48,7 @@ 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
Patch0: https://patch-diff.githubusercontent.com/raw/pear/XML_Util/pull/12.patch 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 BuildArch: noarch
BuildRequires: php(language) > 5.4 BuildRequires: php(language) > 5.4
@ -222,6 +223,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 -p1 < %{PATCH0} patch -p1 < %{PATCH0}
patch -p1 < %{PATCH1}
popd popd
# Why this file here ? # Why this file here ?
@ -334,6 +336,10 @@ fi
%changelog %changelog
* Mon Mar 30 2020 Remi Collet <remi@remirepo.net> - 1:1.10.10-7
- add patch for PEAR and PHP 7.4 from
https://github.com/pear/pear-core/pull/103
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.10-6 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild