You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/10/24 20:29:52 UTC
[1/2] git commit: https://reviews.apache.org/r/6941/ - fix openjdk
build requirement in spec file
Updated Branches:
refs/heads/4.0 d55a63390 -> 6164ec0ac
refs/heads/master 1e0b8e43b -> 1deb31a97
https://reviews.apache.org/r/6941/ - fix openjdk build requirement in spec file
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1deb31a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1deb31a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1deb31a9
Branch: refs/heads/master
Commit: 1deb31a97ecea0dd8aa6a45514563c922e71d03e
Parents: 1e0b8e4
Author: Hiroaki Kawai <ka...@stratosphere.co.jp>
Authored: Wed Oct 24 14:29:19 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Wed Oct 24 14:29:54 2012 -0400
----------------------------------------------------------------------
cloud.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1deb31a9/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index deaf1ca..29c1093 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -38,7 +38,11 @@ Group: System Environment/Libraries
Source0: %{name}-%{_ver}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{_ver}-%{release}-build
+%if 0%{?fedora} >= 17
BuildRequires: java-1.7.0-openjdk-devel
+%else
+BuildRequires: java-1.6.0-openjdk-devel
+%endif
BuildRequires: tomcat6
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils