diff options
| -rw-r--r-- | 103.patch | 25 | ||||
| -rw-r--r-- | php-pear.spec | 16 |
2 files changed, 9 insertions, 32 deletions
diff --git a/103.patch b/103.patch deleted file mode 100644 index c5e9666..0000000 --- a/103.patch +++ /dev/null @@ -1,25 +0,0 @@ -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); - } - } - } diff --git a/php-pear.spec b/php-pear.spec index b3e4f3e..75b9ef0 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -39,8 +39,8 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear -Version: 1.10.10 -Release: 7%{?dist} +Version: 1.10.11 +Release: 1%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -62,7 +62,6 @@ 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 @@ -281,11 +280,10 @@ 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 ? -rm -rf %{buildroot}/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap +rm -rf %{buildroot}/.depdb* %{buildroot}/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap # Need for re-registrying XML_Util install -pm 644 *.xml %{buildroot}%{_localstatedir}/lib/pear/pkgxml @@ -307,11 +305,11 @@ done %check # Check that no bogus paths are left in the configuration, or in # the generated registry files. -grep %{buildroot} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 +grep %{buildroot} %{buildroot}%{_sysconfdir}/pear.conf && exit 1 grep %{_libdir} %{buildroot}%{_sysconfdir}/pear.conf && exit 1 grep '"/tmp"' %{buildroot}%{_sysconfdir}/pear.conf && exit 1 grep /usr/local %{buildroot}%{_sysconfdir}/pear.conf && exit 1 -grep -rl %{buildroot} $RPM_BUILD_ROOT && exit 1 +grep -rl %{buildroot} %{buildroot} && exit 1 %if %{with_tests} @@ -466,6 +464,10 @@ fi %changelog +* Sat Apr 11 2020 Remi Collet <remi@remirepo.net> - 1.10.11-1 +- update to 1.10.11 +- drop patch merged upstream + * 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 |