diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-02-10 09:55:25 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-02-10 09:55:25 +0100 |
| commit | 452ebae12d473cdcb06de616e7c204957c7c5375 (patch) | |
| tree | 3308ac164cb3c9526f2c268614cc91fd589cff75 | |
| parent | 5b348a0634edac698320a5b88700cde10bd78eac (diff) | |
php-horde-Horde-Injector: cleanups for review
| -rw-r--r-- | php-horde-Horde-Injector.spec | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/php-horde-Horde-Injector.spec b/php-horde-Horde-Injector.spec index 6266a28..1d0213f 100644 --- a/php-horde-Horde-Injector.spec +++ b/php-horde-Horde-Injector.spec @@ -5,24 +5,28 @@ Name: php-horde-Horde-Injector Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Horde dependency injection container Group: Development/Libraries License: BSD -URL: http://pear.horde.org +URL: http://%{pear_channel} Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -BuildRequires: php-pear +BuildRequires: php-common >= 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 Requires(post): %{__pear} Requires(postun): %{__pear} -Requires: php(language) >= 5.3.0 +Requires: php-common >= 5.3.0 +Requires: php-pear(PEAR) >= 1.7.0 +Requires: php-reflection +Requires: php-spl 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 @@ -35,8 +39,7 @@ A dependency injection container for Horde. %prep -%setup -q -c -T -tar xif %{SOURCE0} +%setup -q -c cd %{pear_name}-%{version} cp ../package.xml %{name}.xml @@ -60,9 +63,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 \ . @@ -88,11 +92,14 @@ fi %changelog -* Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1 -- Update to 2.0.1 for remi repo +* Sun Feb 10 2013 Remi Collet <remi@fedoraproject.org> - 2.0.1-2 +- cleanups for review -* Fri Nov 2 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1 -- Update to 2.0.0 for remi repo +* Mon Nov 19 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-1 +- Update to 2.0.1 + +* Fri Nov 2 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-1 +- Update to 2.0.0 * Sat Jan 28 2012 Nick Bebout <nb@fedoraproject.org> - 1.0.1-1 - Initial package |