summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Stream.spec21
1 files changed, 10 insertions, 11 deletions
diff --git a/php-horde-Horde-Stream.spec b/php-horde-Horde-Stream.spec
index 2b581ff..454f951 100644
--- a/php-horde-Horde-Stream.spec
+++ b/php-horde-Horde-Stream.spec
@@ -4,7 +4,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Stream
-Version: 1.0.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: Horde stream handler
@@ -15,7 +15,7 @@ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php-pear
+BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
# To run unit tests
BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.0.0
@@ -23,6 +23,9 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.0.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires: php(language) >= 5.3.0
+Requires: php-json
+Requires: php-spl
+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 +40,7 @@ stream contents.
%prep
-%setup -q -c -T
-tar xif %{SOURCE0}
-
+%setup -q -c
cd %{pear_name}-%{version}
cp ../package.xml %{name}.xml
@@ -50,7 +51,6 @@ cd %{pear_name}-%{version}
%install
-rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -67,10 +67,6 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
phpunit -d date.timezone=UTC AllTests.php
-%clean
-rm -rf %{buildroot}
-
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -92,6 +88,9 @@ fi
%changelog
-* Sat Nov 3 2012 Remi Collet <RPMS@FamilleCollet.com> - 3.0.0-1
+* Wed Nov 7 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.1.1-1
+- Update to 1.1.1 for remi repo
+
+* Sat Nov 3 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.0.0-1
- Initial package