From 3fc0ed936bf155dbe45ce99133b17472484b72de Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Feb 23 2017 06:14:05 +0000
Subject: update XML_Util to 1.4.2

drop patch merged upstream

---

diff --git a/.gitignore b/.gitignore
index 8c8e498..e657aac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ clog
 /Archive_Tar-1.4.2.tgz
 /XML_Util-1.4.0.tgz
 /XML_Util-1.4.1.tgz
+/XML_Util-1.4.2.tgz
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 949c3b7..a1e5ff9 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -13,7 +13,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
@@ -27,7 +27,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.10.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
@@ -50,8 +50,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
 BuildRequires: php(language) > 5.4
@@ -189,7 +187,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 ?
@@ -296,6 +293,10 @@ fi
 
 
 %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
diff --git a/sources b/sources
index 1fee1df..f81c041 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ SHA512 (Console_Getopt-1.4.1.tgz) = cbf12a72b33424935f019b17ae8fa55289eae77d3845
 SHA512 (PEAR-1.10.1.tgz) = df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2
 SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833
 SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
-SHA512 (XML_Util-1.4.1.tgz) = 04e6592e7bd262e9215db489c0bfe997186ff40c098b054f3473b0491c4eb10d5a5b774b0eff5ff019744ee3ae3c95aaeb8d65c84f6549d6c7bcda6529d08f26
+SHA512 (XML_Util-1.4.2.tgz) = e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe