summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-05-31 10:19:32 +0200
committerRemi Collet <fedora@famillecollet.com>2013-05-31 10:19:32 +0200
commit4b2ee613e0bd2f052f59a9e12ce6c16e49c0e24b (patch)
tree86a1ebc1eca367dbebb4702a77507a5613446fb2
parentbaab24693b588b3cb5cf60a0db4a2ad574e19d4b (diff)
php-horde-Horde-Nls: 2.0.3
-rw-r--r--php-horde-Horde-Nls.spec14
1 files changed, 8 insertions, 6 deletions
diff --git a/php-horde-Horde-Nls.spec b/php-horde-Horde-Nls.spec
index 87fc160..8ab846b 100644
--- a/php-horde-Horde-Nls.spec
+++ b/php-horde-Horde-Nls.spec
@@ -1,10 +1,9 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%global pear_name Horde_Nls
%global pear_channel pear.horde.org
Name: php-horde-Horde-Nls
-Version: 2.0.2
+Version: 2.0.3
Release: 1%{?dist}
Summary: Native Language Support (NLS)
@@ -27,9 +26,9 @@ Requires: php-pcre
BuildRequires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
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-pecl(geoip)
Requires: php-pear(Net_DNS2)
@@ -41,8 +40,7 @@ Common methods for handling language data, timezones, and hostname->country
lookups.
%prep
-%setup -q -c -T
-tar xif %{SOURCE0}
+%setup -q -c
cd %{pear_name}-%{version}
@@ -103,6 +101,10 @@ fi
%changelog
+* Fri May 31 2013 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
+- Update to 2.0.3
+- switch from Conflicts >= max to Requires < max
+
* Wed Jan 9 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.0.2-1
- Update to 2.0.2 for remi repo
- use local script instead of find_lang