[php-horde-Horde-Xml-Wbxml] Fix FTBFS

[Remi Collet]

commit 2e47009209f3828bef81109cb6433d492d2997fc
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Jun 8 09:08:17 2014 +0200

    Fix FTBFS

 php-horde-Horde-Xml-Wbxml.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/php-horde-Horde-Xml-Wbxml.spec b/php-horde-Horde-Xml-Wbxml.spec
index 79d669a..fdb44d3 100644
--- a/php-horde-Horde-Xml-Wbxml.spec
+++ b/php-horde-Horde-Xml-Wbxml.spec
@@ -1,5 +1,14 @@
+# spec file for php-horde-Horde-Xml-Wbxml
+#
+# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+#
+# License: MIT
+# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name    Horde_Xml_Wbxml
 %global pear_channel pear.horde.org
 
@@ -34,7 +43,7 @@ Requires:       php-pcre
 Requires:       php-xml
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Util) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -70,6 +79,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
+src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 
 # ignore test when wbxml2xml fails
@@ -77,7 +87,7 @@ sed -e '/assertEquals/s/^/if ($xml_ref) /' \
     -i DecodeTest.php
 
 phpunit\
-    -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+    --include-path=$src/lib \
     -d date.timezone=UTC \
     .
 
@@ -108,6 +118,9 @@ fi
 
 
 %changelog
+* Sun Jun 08 2014 Remi Collet <remi at fedoraproject.org> - 2.0.1-6
+- fix FTBFS (include path for test)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild