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 | 043d8e4907ab45a51876656c270c53243dd5ea8b (patch) | |
| tree | e4014c01b0c5f8774a26ffd03fcfe09548601faf | |
| parent | 62d7cd2da9b56005155c3c48553f874cc2899656 (diff) | |
horde: fix FTBFS (include path) + cleanups
| -rw-r--r-- | php-horde-Horde-Crypt-Blowfish.spec | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/php-horde-Horde-Crypt-Blowfish.spec b/php-horde-Horde-Crypt-Blowfish.spec index 07626fd..745f32e 100644 --- a/php-horde-Horde-Crypt-Blowfish.spec +++ b/php-horde-Horde-Crypt-Blowfish.spec @@ -1,5 +1,12 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +# spec file for php-horde-Horde-Crypt-Blowfish +# +# 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_Crypt_Blowfish %global pear_channel pear.horde.org @@ -31,9 +38,9 @@ Requires: php-openssl Requires: php-channel(%{pear_channel}) Requires: php-pear(PEAR) >= 1.7.0 Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 -Conflicts: php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Exception) < 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 Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -66,9 +73,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 \ %if 0%{?rhel} == 5 . || exit 0 |