From 78a041a8ec5064c3f83016356202a8b5b7759964 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2019 08:41:32 +0100 Subject: - update Console_Getopt to 1.4.3 - drop patches merged upstream --- php-pear.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'php-pear.spec') diff --git a/php-pear.spec b/php-pear.spec index 5947011..8aad34c 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -19,7 +19,7 @@ %global peardir %{_datadir}/pear %global metadir %{_localstatedir}/lib/pear -%global getoptver 1.4.2 +%global getoptver 1.4.3 %global arctarver 1.4.8 # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.10 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -61,9 +61,6 @@ 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 - BuildArch: noarch BuildRequires: %{?scl_prefix}php(language) > 5.4 BuildRequires: %{?scl_prefix}php-cli @@ -280,8 +277,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -patch -p1 <%{PATCH0} -patch -p1 <%{PATCH1} +: no patch popd # Why this file here ? @@ -467,6 +463,10 @@ fi %changelog +* Thu Nov 21 2019 Remi Collet - 1:1.10.10-1 +- update Console_Getopt to 1.4.3 +- drop patches merged upstream + * Wed Nov 20 2019 Remi Collet - 1:1.10.10-1 - update PEAR to 1.10.10 -- cgit