Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 25112DD0C for ; Wed, 24 Oct 2012 18:29:52 +0000 (UTC) Received: (qmail 92796 invoked by uid 500); 24 Oct 2012 18:29:52 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 92763 invoked by uid 500); 24 Oct 2012 18:29:52 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 92755 invoked by uid 99); 24 Oct 2012 18:29:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2012 18:29:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 67AF44ED84; Wed, 24 Oct 2012 18:29:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ke4qqq@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: https://reviews.apache.org/r/6941/ - fix openjdk build requirement in spec file Message-Id: <20121024182952.67AF44ED84@tyr.zones.apache.org> Date: Wed, 24 Oct 2012 18:29:52 +0000 (UTC) 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 Authored: Wed Oct 24 14:29:19 2012 -0400 Committer: David Nalley 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