diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-06-08 09:49:19 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-06-08 09:49:19 +0200 |
| commit | d90b35d062166c123781bbfc55bfcfee23a916a0 (patch) | |
| tree | 00e6d8413d2812a81a57ce7e2a58fd5a65e812c7 | |
| parent | bd21b6c1a3f8a7af8aba52b98d946d43001054b7 (diff) | |
horde: fix FTBFS (include path) + cleanups
| -rw-r--r-- | php-horde-Horde-Date-Parser.spec | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/php-horde-Horde-Date-Parser.spec b/php-horde-Horde-Date-Parser.spec index 5fa6e1a..59a1a47 100644 --- a/php-horde-Horde-Date-Parser.spec +++ b/php-horde-Horde-Date-Parser.spec @@ -1,4 +1,12 @@ -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +# 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} %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 \ . |