Repository: cloudstack
Updated Branches:
refs/heads/master 134a7998c -> 155745e26
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/155745e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/155745e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/155745e2
Branch: refs/heads/master
Commit: 155745e26c14799a77fb3987bc40bc578810748e
Parents: 134a799
Author: ynojima <[email protected]>
Authored: Thu May 1 23:27:40 2014 -0600
Committer: ynojima <[email protected]>
Committed: Fri May 2 00:21:24 2014 -0600
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/155745e2/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 83c598b..89e8d4b 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
@@ -138,7 +138,7 @@ The CloudStack agent for KVM hypervisors
%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
