[php-horde-Horde-Date-Parser] fix FTBFS
Remi Collet
remi at fedoraproject.org
Sun Jun 8 06:03:59 UTC 2014
commit 25914b47279bc3916554ac9c5b173e34d9ad23f2
Author: Remi Collet <remi at fedoraproject.org>
Date: Sun Jun 8 08:03:49 2014 +0200
fix FTBFS
php-horde-Horde-Date-Parser.spec | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/php-horde-Horde-Date-Parser.spec b/php-horde-Horde-Date-Parser.spec
index 969ae5b..42b6d39 100644
--- a/php-horde-Horde-Date-Parser.spec
+++ b/php-horde-Horde-Date-Parser.spec
@@ -1,5 +1,13 @@
+# spec file for php-horde-Horde-Kolab-Format
+#
+# Copyright (c) 2013-2014 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# 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_Date_Parser
%global pear_channel pear.horde.org
@@ -29,9 +37,9 @@ Requires: php-pcre
Requires: php-spl
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-pear(%{pear_channel}/Horde_Date) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Date) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Date) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Support) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0
Requires: php-channel(%{pear_channel})
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -67,9 +75,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} \
+ --include-path=$src/lib \
-d date.timezone=UTC \
.
@@ -94,6 +103,9 @@ fi
%changelog
+* Sun Jun 08 2014 Remi Collet <remi at fedoraproject.org> - 2.0.2-3
+- fix FTBFS (include path for test)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list