From 8f25be7c0f87bd3d1483256bcd913cda1a54a97e Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 3 May 2015 15:03:16 +0200 Subject: [PATCH] CLOUDSTACK-8404: uninstall/conflict if java-1.8.0-openjdk is installed This would force to uninstall openjdk 1.8.0 and only install 1.7 in case of ACS 4.5.x releases. On master/4.6, we might support java 1.8. Signed-off-by: Rohit Yadav --- packaging/centos63/cloud.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index e1a29030ca8..04bc8051508 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -63,6 +63,7 @@ intelligent IaaS cloud implementation. Summary: CloudStack management server UI Requires: %{_tomcatversion} Requires: %{_javaversion} +Conflicts: java-1.8.0-openjdk Requires: python Requires: bash Requires: bzip2 @@ -117,6 +118,7 @@ The Apache CloudStack files shared between agent and management server Summary: CloudStack Agent for KVM hypervisors Requires: openssh-clients Requires: %{_javaversion} +Conflicts: java-1.8.0-openjdk Requires: %{name}-common = %{_ver} Requires: libvirt Requires: bridge-utils @@ -156,6 +158,7 @@ The CloudStack baremetal agent %package usage Summary: CloudStack Usage calculation server Requires: %{_javaversion} +Conflicts: java-1.8.0-openjdk Requires: jsvc Requires: jakarta-commons-daemon Requires: jakarta-commons-daemon-jsvc