From 031d7a9c43c5082913064a39829ecefb2239c5ab Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 29 Apr 2015 16:09:48 +0200 Subject: [PATCH] CLOUDSTACK-8402: Depend on openjdk 1.7 for both CentOS 6 and 7 This commit forces rpms to depend on java-1.7.0-openjdk which is available on both CentOS 6 and CentOS 7, also the version that ACS 4.5 supports. Signed-off-by: Rohit Yadav --- packaging/centos63/default/macros.spec | 2 +- packaging/centos63/rhel7/macros.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/centos63/default/macros.spec b/packaging/centos63/default/macros.spec index 638b07be4ba..f20bde0dea1 100644 --- a/packaging/centos63/default/macros.spec +++ b/packaging/centos63/default/macros.spec @@ -16,7 +16,7 @@ # under the License. %define _pythonparamiko Requires: python-paramiko -%define _javaversion java => 1.7.0 +%define _javaversion java-1.7.0-openjdk %define _tomcatversion tomcat6 %define _vlanconfigtool vconfig %define _tomcatpathname tomcat6 diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec index 13eaf8ebfe3..7d7ee616b4c 100644 --- a/packaging/centos63/rhel7/macros.spec +++ b/packaging/centos63/rhel7/macros.spec @@ -16,7 +16,7 @@ # under the License. %define _pythonparamiko %{nil} -%define _javaversion java => 1.7.0 +%define _javaversion java-1.7.0-openjdk %define _tomcatversion tomcat => 7.0 %define _vlanconfigtool iproute %define _tomcatpathname tomcat