summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-11-07 09:38:49 +0100
committerRemi Collet <fedora@famillecollet.com>2012-11-07 09:38:49 +0100
commitd1df390c9968a674fe271efbb4d831a514be2dff (patch)
tree1e1368338ddbec5fa436bf6835eec7a21af7645d
parentfb75e970ab04aaae95d46c343ce2c72365658ca1 (diff)
php-horde-Horde-Rpc: 2.0.1
-rw-r--r--php-horde-Horde-Rpc.spec30
1 files changed, 17 insertions, 13 deletions
diff --git a/php-horde-Horde-Rpc.spec b/php-horde-Horde-Rpc.spec
index 1bdcaf0..be344a4 100644
--- a/php-horde-Horde-Rpc.spec
+++ b/php-horde-Horde-Rpc.spec
@@ -4,7 +4,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Rpc
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
Summary: Horde RPC API
@@ -18,7 +18,7 @@ Source1: find-lang.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
-BuildRequires: php-pear
+BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
Requires(post): %{__pear}
@@ -29,9 +29,8 @@ Requires: php-date
Requires: php-mbstring
Requires: php-pcre
Requires: php-session
-Requires: php-soap
Requires: php-spl
-Requires: php-xmlrpc
+Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Core) >= 2.0.0
Conflicts: php-pear(%{pear_channel}/Horde_Core) >= 3.0.0
@@ -49,7 +48,16 @@ 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_Xml_Element) >= 2.0.0
Conflicts: php-pear(%{pear_channel}/Horde_Xml_Element) >= 3.0.0
-# Optionnal: Horde_ActiveSync, Horde_Http, Horde_Lock, Horde_SyncMl</name>
+# Optional
+Requires: php-soap
+Requires: php-xmlrpc
+Requires: php-pear(%{pear_channel}/Horde_Http) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_Http) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Lock) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_Lock) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_SyncMl) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_SyncMl) >= 3.0.0
+# TODO Horde_ActiveSync
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -59,9 +67,7 @@ functionality.
%prep
-%setup -q -c -T
-tar xif %{SOURCE0}
-
+%setup -q -c
cd %{pear_name}-%{version}
# Don't install .po and .pot files
@@ -83,7 +89,6 @@ done
%install
cd %{pear_name}-%{version}
-rm -rf %{buildroot}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
@@ -100,10 +105,6 @@ sh %{SOURCE1} %{buildroot} %{pear_name}
%endif
-%clean
-rm -rf %{buildroot}
-
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -130,5 +131,8 @@ fi
%changelog
+* Wed Nov 7 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1
+- Update to 2.0.1 for remi repo
+
* Sun Nov 4 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
- Initial package