diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-02-06 15:30:15 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-02-06 15:30:15 +0100 |
| commit | 31ba7394b34704c7a5cf61d51ac43244793fc02d (patch) | |
| tree | 6fb94c3e206a92c0b580835f61f03b9eb3af6786 | |
| parent | 13346d9f53d4f755d018bfaa35dec36b3ae65f59 (diff) | |
php-horde-Horde-Text-Diff: cleanups for review
| -rw-r--r-- | php-horde-Horde-Text-Diff.spec | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/php-horde-Horde-Text-Diff.spec b/php-horde-Horde-Text-Diff.spec index ea442a3..76f49ef 100644 --- a/php-horde-Horde-Text-Diff.spec +++ b/php-horde-Horde-Text-Diff.spec @@ -5,29 +5,33 @@ Name: php-horde-Horde-Text-Diff Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Engine for performing and rendering text diffs Group: Development/Libraries -License: LGPLv2+ -URL: http://pear.horde.org +License: LGPLv2 +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-pcre +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 Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0 +# Optional but not yet available : php-pecl-xdiff Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -50,6 +54,7 @@ cd %{pear_name}-%{version} %install +rm -rf %{buildroot} cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml @@ -62,13 +67,18 @@ 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 \ . +%clean +rm -rf %{buildroot} + + %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : @@ -90,6 +100,9 @@ fi %changelog +* Wed Feb 6 2013 Remi Collet <remi@fedoraproject.org> - 2.0.1-2 +- cleanups for review + * Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1 - Update to 2.0.1 for remi repo |