From aea73665d3202a0bf1917539df2db18e262b4f54 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Mar 2013 14:11:50 +0100 Subject: php-horde-Horde-Notification: cleanups before review --- php-horde-Horde-Notification.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/php-horde-Horde-Notification.spec b/php-horde-Horde-Notification.spec index 799d06f..203e30d 100644 --- a/php-horde-Horde-Notification.spec +++ b/php-horde-Horde-Notification.spec @@ -5,7 +5,7 @@ Name: php-horde-Horde-Notification Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Horde Notification System Group: Development/Libraries @@ -15,7 +15,8 @@ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -BuildRequires: php-pear +BuildRequires: php(language) >= 5.3.0 +BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) # To run unit tests BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 @@ -24,6 +25,7 @@ Requires(post): %{__pear} Requires(postun): %{__pear} Requires: php(language) >= 5.3.0 Requires: php-gettext +Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Conflicts: php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0 @@ -37,9 +39,9 @@ Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} A library implementing a subject-observer pattern for raising and showing messages of different types and to different listeners. + %prep -%setup -q -c -T -tar xif %{SOURCE0} +%setup -q -c cd %{pear_name}-%{version} cp ../package.xml %{name}.xml @@ -63,9 +65,10 @@ 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) -phpunit\ - -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \ +phpunit \ + -d include_path=$src/lib:.:%{pear_phpdir} \ -d date.timezone=UTC \ . @@ -91,6 +94,9 @@ fi %changelog +* Tue Mar 26 2013 Remi Collet - 2.0.1-2 +- cleanups before review + * Mon Nov 19 2012 Remi Collet - 2.0.1-1 - Update to 2.0.1 for remi repo -- cgit