[php-horde-Horde-Template] fix FTBFS

Remi Collet remi at fedoraproject.org
Sun Jun 8 07:37:43 UTC 2014


commit ecad42cd8d96936edf82c71693e9304427460d3d
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Jun 8 09:37:30 2014 +0200

    fix FTBFS

 php-horde-Horde-Template.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/php-horde-Horde-Template.spec b/php-horde-Horde-Template.spec
index c07990e..d79af33 100644
--- a/php-horde-Horde-Template.spec
+++ b/php-horde-Horde-Template.spec
@@ -1,5 +1,14 @@
+# spec file for php-horde-Horde-Template
+#
+# 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_Template
 %global pear_channel pear.horde.org
 
@@ -62,9 +71,10 @@ 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)
-phpunit\
-    -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+phpunit \
+    --include-path=$src/lib \
     -d date.timezone=UTC \
     .
 
@@ -89,6 +99,9 @@ fi
 
 
 %changelog
+* Sun Jun 08 2014 Remi Collet <remi at fedoraproject.org> - 2.0.1-5
+- fix FTBFS (include path for test)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list