Skip to content

Commit 031d7a9

Browse files
committed
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 <rohit.yadav@shapeblue.com>
1 parent 795f381 commit 031d7a9

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

packaging/centos63/default/macros.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
%define _pythonparamiko Requires: python-paramiko
19-
%define _javaversion java => 1.7.0
19+
%define _javaversion java-1.7.0-openjdk
2020
%define _tomcatversion tomcat6
2121
%define _vlanconfigtool vconfig
2222
%define _tomcatpathname tomcat6

packaging/centos63/rhel7/macros.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
%define _pythonparamiko %{nil}
19-
%define _javaversion java => 1.7.0
19+
%define _javaversion java-1.7.0-openjdk
2020
%define _tomcatversion tomcat => 7.0
2121
%define _vlanconfigtool iproute
2222
%define _tomcatpathname tomcat

0 commit comments

Comments
 (0)