summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-02-23 07:27:18 +0100
committerRemi Collet <fedora@famillecollet.com>2017-02-23 07:27:18 +0100
commita441017d0b2d65760e37da432927e1df62fcb6ae (patch)
treee21c703694241e5d86655f8ca3783f2ae21eda44
parenta128876c1cc70e9524e8d08e707829224cb2721d (diff)
php-pear: XML_Util 1.4.2
-rw-r--r--XML_Util-pr8.patch26
-rw-r--r--php-pear.spec11
2 files changed, 6 insertions, 31 deletions
diff --git a/XML_Util-pr8.patch b/XML_Util-pr8.patch
deleted file mode 100644
index 2a41893..0000000
--- a/XML_Util-pr8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 59e2d9738dd25cd751b810e5431b96e836864152 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 22 Feb 2017 11:39:37 +0100
-Subject: [PATCH] Fix #21184, collapseEmptyTags breaks XML_Serializer
-
----
- XML/Util.php | 2 +-
- package.xml | 1 +
- tests/Bug21184Tests.php | 18 ++++++++++++++++++
- 3 files changed, 20 insertions(+), 1 deletion(-)
- create mode 100644 tests/Bug21184Tests.php
-
-diff --git a/XML/Util.php b/XML/Util.php
-index af8211b..0bb7e5e 100644
---- a/XML/Util.php
-+++ b/XML/Util.php
-@@ -483,7 +483,7 @@ public static function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
- '${4}' . // attributes
- ' />'
- ;
-- return preg_replace($preg1, $preg2, $xml);
-+ return (preg_replace($preg1, $preg2, $xml)?:$xml);
- break;
- case XML_UTIL_COLLAPSE_XHTML_ONLY:
- return preg_replace(
-
diff --git a/php-pear.spec b/php-pear.spec
index 75c3126..1c405e6 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -24,7 +24,7 @@
# https://pear.php.net/bugs/bug.php?id=19367
# Structures_Graph 1.0.4 - incorrect FSF address
%global structver 1.1.1
-%global xmlutil 1.4.1
+%global xmlutil 1.4.2
%global manpages 1.10.0
# Tests are only run with rpmbuild --with tests
@@ -40,7 +40,7 @@
Summary: PHP Extension and Application Repository framework
Name: %{?scl_prefix}php-pear
Version: 1.10.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Epoch: 1
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
# Structures_Graph is LGPLv3+
@@ -64,8 +64,6 @@ Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz
# https://github.com/pear/pear-core/pull/51
Patch0: pear-proxy.patch
-# https://github.com/pear/XML_Util/pull/8
-Patch1: XML_Util-pr8.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -248,7 +246,6 @@ install -m 644 -D macros.pear \
# apply patches on installed PEAR tree
pushd $RPM_BUILD_ROOT%{peardir}
patch --no-backup --fuzz 0 -p1 < %{PATCH0}
-patch --no-backup --fuzz 0 -p1 < %{PATCH1}
popd
# Why this file here ?
@@ -432,6 +429,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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
+
* Wed Feb 22 2017 Remi Collet <remi@fedoraproject.org> 1:1.10.1-11
- add patch to fix XML_Serializer with XML_Util 1.4.1
from https://github.com/pear/XML_Util/pull/8