You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/05/06 01:43:51 UTC
git commit: updated refs/heads/master to 3ac3534
Repository: cloudstack
Updated Branches:
refs/heads/master 628dde7fd -> 3ac353454
Revert "CLOUDSTACK-8402: EL7 rpms should depend on openjdk7"
This does not fail on centos7, reverting the fix.
This reverts commit 52a0adad04d67555a50ab58662735039f438c7e0.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ac35345
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ac35345
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ac35345
Branch: refs/heads/master
Commit: 3ac3534544d5c6d0730a0adeb4d6e13b575187e8
Parents: 628dde7
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed May 6 01:41:16 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 6 01:43:35 2015 +0200
----------------------------------------------------------------------
packaging/centos7/cloud.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ac35345/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 2037cf1..ce1b6b8 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: tomcat => 7.0
-Requires: java-1.7.0-openjdk
+Requires: java => 1.7.0
Requires: python
Requires: bash
Requires: bzip2
@@ -99,7 +99,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-openjdk
+Requires: java => 1.7.0
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@@ -134,7 +134,7 @@ The CloudStack baremetal agent
%package usage
Summary: CloudStack Usage calculation server
-Requires: java-1.7.0-openjdk
+Requires: java => 1.7.0
Requires: jsvc
Requires: jakarta-commons-daemon
Requires: jakarta-commons-daemon-jsvc