summaryrefslogtreecommitdiffstats
path: root/php-pear.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-11-19 09:00:21 +0100
committerRemi Collet <remi@remirepo.net>2019-11-19 09:00:21 +0100
commit7e5082e23b3c4517da6a07b1144da6015230e60c (patch)
tree846a4918bc2b9f0dfc2d639bc0538f342733e6cc /php-pear.spec
parent89a12e2525e58e352371a1e270da4dd334ce597a (diff)
add upstream patches for PHP 7.4
Diffstat (limited to 'php-pear.spec')
-rw-r--r--php-pear.spec15
1 files changed, 13 insertions, 2 deletions
diff --git a/php-pear.spec b/php-pear.spec
index 1ec79a2..8f1d488 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.9
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
# Structures_Graph is LGPLv3+
@@ -61,6 +61,11 @@ 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/Console_Getopt/pull/4.patch
+Patch1: https://patch-diff.githubusercontent.com/raw/pear/Console_Getopt/pull/5.patch
+Patch2: https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/98.patch
+Patch3: https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/97.patch
+
BuildArch: noarch
BuildRequires: %{?scl_prefix}php(language) > 5.4
BuildRequires: %{?scl_prefix}php-cli
@@ -277,7 +282,10 @@ install -m 644 -D macros.pear \
# apply patches on installed PEAR tree
pushd %{buildroot}%{peardir}
-: no patch
+patch -p1 <%{PATCH0}
+patch -p1 <%{PATCH1}
+patch -p1 <%{PATCH2}
+patch -p1 <%{PATCH3}
popd
# Why this file here ?
@@ -463,6 +471,9 @@ fi
%changelog
+* Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 1:1.10.9-5
+- add upstream patches for PHP 7.4
+
* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 1:1.10.9-4
- update Archive_Tar to 1.4.8