You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/05/07 16:05:03 UTC
[25/50] [abbrv] git commit: updated refs/heads/master to 1c408de
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 <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/031d7a9c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/031d7a9c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/031d7a9c
Branch: refs/heads/master
Commit: 031d7a9c43c5082913064a39829ecefb2239c5ab
Parents: 795f381
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Apr 29 16:09:48 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Apr 29 16:50:40 2015 +0200
----------------------------------------------------------------------
packaging/centos63/default/macros.spec | 2 +-
packaging/centos63/rhel7/macros.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/031d7a9c/packaging/centos63/default/macros.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/default/macros.spec b/packaging/centos63/default/macros.spec
index 638b07b..f20bde0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/031d7a9c/packaging/centos63/rhel7/macros.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec
index 13eaf8e..7d7ee61 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