Repository: cloudstack Updated Branches: refs/heads/4.5 e6a02acb0 -> 8f25be7c0
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f25be7c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f25be7c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f25be7c Branch: refs/heads/4.5 Commit: 8f25be7c0f87bd3d1483256bcd913cda1a54a97e Parents: e6a02ac Author: Rohit Yadav <[email protected]> Authored: Sun May 3 15:03:16 2015 +0200 Committer: Rohit Yadav <[email protected]> Committed: Sun May 3 15:04:33 2015 +0200 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f25be7c/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index e1a2903..04bc805 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
