Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 2e5b52915 -> fa4e7fc7f
CLOUDSTACK-6351 bugfix: Java1.6 is installed instead of Java7
Since epoch spesicifation doesn't work on RHEL6.3,
"java7" is used in the rpm spec.
Conflicts:
packaging/centos63/cloud.spec
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa4e7fc7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa4e7fc7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa4e7fc7
Branch: refs/heads/4.4-forward
Commit: fa4e7fc7f75c7cf6065b2e97e1d27c942c9a73af
Parents: 2e5b529
Author: ynojima <m...@ynojima.net>
Authored: Thu May 1 23:27:40 2014 -0600
Committer: ynojima <m...@ynojima.net>
Committed: Fri May 2 00:19:50 2014 -0600
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa4e7fc7/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 4a5a6d6..e8f6bec 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: tomcat6
-Requires: java >= 1.7.0
+Requires: java7
Requires: python
Requires: bash
Requires: bzip2
@@ -112,7 +112,7 @@ The Apache CloudStack files shared between agent and
management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients
-Requires: java >= 1.7.0
+Requires: java7
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@@ -150,7 +150,7 @@ The CloudStack baremetal agent
%package usage
Summary: CloudStack Usage calculation server
-Requires: java >= 1.7.0
+Requires: java7
Requires: jsvc
Requires: jakarta-commons-daemon
Requires: jakarta-commons-daemon-jsvc
