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 | 7f3285ff20633b8f42a14412888ed4daa4fd2691 (patch) | |
| tree | 44d8251567eb764fafa5849b2d6f73e8c98c3d73 | |
| parent | 9b83218a37ee513ebf2ae408142de7ee28fb77d4 (diff) | |
horde: fix FTBFS (include path) + cleanups
| -rw-r--r-- | php-horde-Horde-Kolab-Server.spec | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/php-horde-Horde-Kolab-Server.spec b/php-horde-Horde-Kolab-Server.spec index 9d4e90c..70b4199 100644 --- a/php-horde-Horde-Kolab-Server.spec +++ b/php-horde-Horde-Kolab-Server.spec @@ -6,8 +6,7 @@ # # Please, preserve the changelog entries # -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name Horde_Kolab_Server %global pear_channel pear.horde.org @@ -35,14 +34,10 @@ Requires: php-pear(PEAR) >= 1.7.0 Requires: php-pcre Requires: php-channel(%{pear_channel}) Requires: php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0 -Conflicts: php-pear(%{pear_channel}/Horde_Auth) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Auth) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 -Conflicts: php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0 -# optional -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_Ldap) >= 2.0.0 -Conflicts: php-pear(%{pear_channel}/Horde_Ldap) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 +# optional and implicitly required: Horde_Date, Horde_Ldap Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -79,7 +74,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} src=$(pwd)/%{pear_name}-%{version} cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) phpunit \ - -d include_path=$src/lib:.:%{pear_phpdir} \ + --include-path=$src/lib \ -d date.timezone=UTC \ . |