From 3ac3534544d5c6d0730a0adeb4d6e13b575187e8 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 6 May 2015 01:41:16 +0200 Subject: [PATCH] Revert "CLOUDSTACK-8402: EL7 rpms should depend on openjdk7" This does not fail on centos7, reverting the fix. This reverts commit 52a0adad04d67555a50ab58662735039f438c7e0. --- packaging/centos7/cloud.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 2037cf19aa3..ce1b6b845a0 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