From 8fffadb7467653cf1b532c310e5d0a8afa471038 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 10 Feb 2013 17:07:45 +0100 Subject: php-horde-Horde-Vfs: cleanups for review --- php-horde-Horde-Vfs.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/php-horde-Horde-Vfs.spec b/php-horde-Horde-Vfs.spec index 09d24e2..243bd0c 100644 --- a/php-horde-Horde-Vfs.spec +++ b/php-horde-Horde-Vfs.spec @@ -3,21 +3,23 @@ %global pear_name Horde_Vfs %global pear_channel pear.horde.org -# currently all tests are skipped +# currently tests are not ready +# Fatal error: Access to undeclared static property: Horde_Vfs_SmbTest::$reason in %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: php-horde-Horde-Vfs Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual File System API Group: Development/Libraries -License: LGPLv2+ +License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch +BuildRequires: php-common >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) BuildRequires: gettext @@ -29,7 +31,7 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Db) >= 2.0.0 Requires(post): %{__pear} Requires(postun): %{__pear} -Requires: php(language) >= 5.3.0 +Requires: php-common >= 5.3.0 Requires: php-date Requires: php-pcre Requires: php-posix @@ -44,8 +46,16 @@ Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0 # Optionnal Requires: php-ftp Requires: php-pecl(ssh2) +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_Db) >= 2.0.0 Conflicts: php-pear(%{pear_channel}/Horde_Db) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0 +Conflicts: php-pear(%{pear_channel}/Horde_Mime) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0 +Conflicts: php-pear(%{pear_channel}/Horde_Perms) >= 3.0.0 +# skip Horde_Core (avoid circular dependency) +# TODO Horde_Kolab_Session Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -144,6 +154,9 @@ fi %changelog +* Sun Feb 10 2013 Remi Collet - 2.0.4-2 +- cleanups for review + * Thu Jan 10 2013 Remi Collet - 2.0.4-1 - Update to 2.0.4 for remi repo - add option for test (need investigation) -- cgit