[php-horde-Horde-Text-Filter-Csstidy] fix FTBFS

Remi Collet remi at fedoraproject.org
Sun Jun 8 07:00:01 UTC 2014


commit 5ba75138109ff81e7216e9103926ad3f528ec447
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Jun 8 08:59:51 2014 +0200

    fix FTBFS

 php-horde-Horde-Text-Filter-Csstidy.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/php-horde-Horde-Text-Filter-Csstidy.spec b/php-horde-Horde-Text-Filter-Csstidy.spec
index 97cfc71..a936f26 100644
--- a/php-horde-Horde-Text-Filter-Csstidy.spec
+++ b/php-horde-Horde-Text-Filter-Csstidy.spec
@@ -37,7 +37,7 @@ Requires:       php-pcre
 Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 Requires:       php-pear(%{pear_channel}/Horde_Text_Filter) >= 2.0.0
-Conflicts:      php-pear(%{pear_channel}/Horde_Text_Filter) >= 3.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Text_Filter) <  3.0.0
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -74,10 +74,11 @@ 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)
 # All skiped for now
 phpunit\
-    -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+    --include-path=$src/lib \
     -d date.timezone=UTC \
     .
 
@@ -102,6 +103,9 @@ fi
 
 
 %changelog
+* Sun Jun 08 2014 Remi Collet <remi at fedoraproject.org> - 2.0.1-2
+- fix FTBFS (include path for test)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list