From c03f30fbc0acec1ce6d5eec33d9733059572ba0f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Jan 2014 07:19:10 +0100 Subject: php-horde-Horde-LoginTasks: 2.0.3 --- php-horde-Horde-LoginTasks.spec | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/php-horde-Horde-LoginTasks.spec b/php-horde-Horde-LoginTasks.spec index b58f75c..b924982 100644 --- a/php-horde-Horde-LoginTasks.spec +++ b/php-horde-Horde-LoginTasks.spec @@ -1,10 +1,18 @@ -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +# spec file for php-horde-Horde-LoginTasks +# +# Copyright (c) 2012-2014 Nick Bebout, Remi Collet +# +# License: MIT +# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense +# +# Please, preserve the changelog entries +# +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name Horde_LoginTasks %global pear_channel pear.horde.org Name: php-horde-Horde-LoginTasks -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: Horde Login Tasks System @@ -29,10 +37,10 @@ Requires: php-date BuildRequires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) Requires: php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0 -Conflicts: php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0 +Requires: php-pear(%{pear_channel}/Horde_Translation) < 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_Date) < 3.0.0 Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -83,9 +91,10 @@ done | tee ../%{pear_name}.lang %check -cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:) +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} \ + --include-path=$src/lib \ -d date.timezone=UTC \ . @@ -113,16 +122,19 @@ fi %changelog -* Wed Jan 9 2013 Remi Collet - 2.0.2-1 -- Update to 2.0.2 for remi repo +* Wed Jan 29 2014 Remi Collet - 2.0.3-1 +- Update to 2.0.3 + +* Wed Jan 9 2013 Remi Collet - 2.0.2-1 +- Update to 2.0.2 - use local script instead of find_lang - new test layout (requires Horde_Test 2.1.0) -* Wed Nov 7 2012 Remi Collet - 2.0.1-1 -- Update to 2.0.1 for remi repo +* Wed Nov 7 2012 Remi Collet - 2.0.1-1 +- Update to 2.0.1 -* Thu Nov 1 2012 Remi Collet - 2.0.0-1 -- Update to 2.0.0 for remi repo +* Thu Nov 1 2012 Remi Collet - 2.0.0-1 +- Update to 2.0.0 * Sat Jan 28 2012 Nick Bebout - 1.0.3-1 - Initial package -- cgit