From 2c7261170ae744d0c978a30a0fcc6bd4fb5d56df Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jul 08 2014 12:00:05 +0000 Subject: update to 4.1.5 --- diff --git a/.gitignore b/.gitignore index 3c3bc11..ea4bb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /turba-4.1.4.tgz +/turba-4.1.5.tgz diff --git a/php-horde-turba.spec b/php-horde-turba.spec index 0fd87e4..e540f4b 100644 --- a/php-horde-turba.spec +++ b/php-horde-turba.spec @@ -11,12 +11,9 @@ %global pear_name turba %global pear_channel pear.horde.org -# TODO -# Test suite is not ready (requires Framework 5.2) - Name: php-horde-turba -Version: 4.1.4 -Release: 2%{?dist} +Version: 4.1.5 +Release: 1%{?dist} Summary: A web based address book Group: Development/Libraries @@ -30,6 +27,8 @@ BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) BuildRequires: php-pear(%{pear_channel}/Horde_Role) >= 1.0.0 +BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 +BuildRequires: php-pear(%{pear_channel}/Horde_Core) >= 2.3.0 Requires(post): %{__pear} Requires(postun): %{__pear} @@ -173,11 +172,14 @@ done | tee ../%{pear_name}.lang %check src=$(pwd)/%{pear_name}-%{version} cd %{pear_name}-%{version}/test/Turba -: tests not ready -#phpunit\ -# -d include_path=$src/lib:.:%{pear_phpdir} \ -# -d date.timezone=UTC \ -# . +# disable as this test use Horde_ActiveSync (non-free) +sed -e 's/function testDuplicateDetectionFromAsWithNoEmail/function SKIP_testDuplicateDetectionFromAsWithNoEmail/' \ + -i Unit/Driver/Base.php + +phpunit\ + --include-path=$src/lib \ + -d date.timezone=UTC \ + . %post @@ -220,6 +222,10 @@ fi %changelog +* Mon Jul 07 2014 Remi Collet - 4.1.5-1 +- Update to 4.1.5 +- run test suite during build + * Fri May 16 2014 Remi Collet - 4.1.4-2 - preserve package.xml timestamp - fix license (ASL 1.0) from review #1087742 diff --git a/sources b/sources index 2739743..2610ff1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -868edbe84be2f365ed9f3930a94a35eb turba-4.1.4.tgz +86603ce7a3a15eb4815aff20a4f386a1 turba-4.1.5.tgz