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 | 582c0d1d19214b97cb7008f2596785d8acaf835c (patch) | |
| tree | 7744a86996adf83bf3ff705e4f0b91a88f4eb3e9 | |
| parent | 8c8ad87812d0e38528fcbf7b8ae4c91f244afd7a (diff) | |
horde: fix FTBFS (include path) + cleanups
| -rw-r--r-- | php-horde-Horde-Text-Filter-Csstidy.spec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/php-horde-Horde-Text-Filter-Csstidy.spec b/php-horde-Horde-Text-Filter-Csstidy.spec index 022f892..7a89810 100644 --- a/php-horde-Horde-Text-Filter-Csstidy.spec +++ b/php-horde-Horde-Text-Filter-Csstidy.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_Text_Filter_Csstidy %global pear_channel pear.horde.org @@ -38,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} @@ -76,10 +75,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 \ . |