summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-01-10 08:30:16 +0100
committerRemi Collet <fedora@famillecollet.com>2014-01-10 08:30:16 +0100
commit11a968bc15b95b582189d252c8ec50bcaf292e50 (patch)
tree7f1041e8c8dddfc05aec48d99f9854f10654e68d
parent71360d973380eb602c93da2839cc0e0763dd9d39 (diff)
php-horde-Horde-Core: cleanups
-rw-r--r--php-horde-Horde-Core.spec14
1 files changed, 11 insertions, 3 deletions
diff --git a/php-horde-Horde-Core.spec b/php-horde-Horde-Core.spec
index b25bf54..c13b39f 100644
--- a/php-horde-Horde-Core.spec
+++ b/php-horde-Horde-Core.spec
@@ -13,7 +13,7 @@
Name: php-horde-Horde-Core
Version: 2.11.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Horde Core Framework libraries
Group: Development/Libraries
@@ -138,8 +138,8 @@ Requires: php-pear(%{pear_channel}/Horde_Editor) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Editor) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_ElasticSearch) >= 1.0.0
Requires: php-pear(%{pear_channel}/Horde_ElasticSearch) < 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Form) >= 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Form) < 3.0.0
+#Requires: php-pear(%{pear_channel}/Horde_Form) >= 2.0.0
+#Requires: php-pear(%{pear_channel}/Horde_Form) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Kolab_Server) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Kolab_Server) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Kolab_Session) >= 2.0.0
@@ -196,6 +196,7 @@ done
%install
+rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -215,6 +216,10 @@ do
done | tee ../%{pear_name}.lang
+%clean
+rm -rf %{buildroot}
+
+
%check
src=$(pwd)/%{pear_name}-%{version}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
@@ -264,6 +269,9 @@ fi
%changelog
+* Fri Jan 10 2014 Remi Collet <remi@fedoraproject.org> - 2.11.1-2
+- cleanups from reviews #908329
+
* Wed Nov 20 2013 Remi Collet <remi@fedoraproject.org> - 2.11.1-1
- Update to 2.11.1