summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-02-28 15:45:35 +0100
committerRemi Collet <fedora@famillecollet.com>2017-02-28 15:45:35 +0100
commit5310c16ca5541f08794beb1a50f58cfef849e040 (patch)
treec643931f0423a0541cacab58c6e89216e0110675
parenta441017d0b2d65760e37da432927e1df62fcb6ae (diff)
php-pear: 1.10.2
-rw-r--r--php-pear.spec16
1 files changed, 8 insertions, 8 deletions
diff --git a/php-pear.spec b/php-pear.spec
index 1c405e6..53842ff 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.1
-Release: 12%{?dist}
+Version: 1.10.2
+Release: 1%{?dist}
Epoch: 1
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
# Structures_Graph is LGPLv3+
@@ -62,9 +62,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
-# https://github.com/pear/pear-core/pull/51
-Patch0: pear-proxy.patch
-
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php(language) > 5.4
@@ -161,8 +158,8 @@ do
done
cp %{SOURCE1} .
-# apply patches on used PEAR during install
-# Patches applied on installation tree
+# apply patches on PEAR needed during install
+# other patches applied on installation tree
sed -e 's/@SCL@/%{?scl:%{scl}_}/' \
-e 's:@VARDIR@:%{_localstatedir}:' \
@@ -245,7 +242,7 @@ install -m 644 -D macros.pear \
# apply patches on installed PEAR tree
pushd $RPM_BUILD_ROOT%{peardir}
-patch --no-backup --fuzz 0 -p1 < %{PATCH0}
+: no patch \\o/
popd
# Why this file here ?
@@ -429,6 +426,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> 1:1.10.2-1
+- update PEAR to 1.10.2
+
* Thu Feb 23 2017 Remi Collet <remi@fedoraproject.org> 1:1.10.1-12
- update XML_Util to 1.4.2
- drop patch merged upstream