apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8402: Depend on openjdk 1.7 for both CentOS 6 and 7

Browse Source 
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>
This commit is contained in:
Rohit Yadav 2015-04-29 16:09:48 +02:00
parent 795f3814f6
commit 031d7a9c43
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/centos63/default/macros.spec
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
%define _pythonparamiko Requires: python-paramiko %define _pythonparamiko Requires: python-paramiko
%define _javaversion java => 1.7.0 %define _javaversion java-1.7.0-openjdk
%define _tomcatversion tomcat6 %define _tomcatversion tomcat6
%define _vlanconfigtool vconfig %define _vlanconfigtool vconfig
%define _tomcatpathname tomcat6 %define _tomcatpathname tomcat6

2
packaging/centos63/rhel7/macros.spec
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
%define _pythonparamiko %{nil} %define _pythonparamiko %{nil}
%define _javaversion java => 1.7.0 %define _javaversion java-1.7.0-openjdk
%define _tomcatversion tomcat => 7.0 %define _tomcatversion tomcat => 7.0
%define _vlanconfigtool iproute %define _vlanconfigtool iproute
%define _tomcatpathname tomcat %define _tomcatpathname tomcat