Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-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 1E62E90B0 for ; Thu, 26 Jan 2012 00:43:27 +0000 (UTC) Received: (qmail 94298 invoked by uid 500); 26 Jan 2012 00:43:26 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 94251 invoked by uid 500); 26 Jan 2012 00:43:26 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 94244 invoked by uid 99); 26 Jan 2012 00:43:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 00:43:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 00:43:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6EA28238889B; Thu, 26 Jan 2012 00:43:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1235998 - /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Date: Thu, 26 Jan 2012 00:43:04 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120126004304.6EA28238889B@eris.apache.org> Author: rvs Date: Thu Jan 26 00:43:04 2012 New Revision: 1235998 URL: http://svn.apache.org/viewvc?rev=1235998&view=rev Log: BIGTOP-357. libjvm.so dependency on CentOS can only be satisfied by libgcj in some cases Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1235998&r1=1235997&r2=1235998&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original) +++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Thu Jan 26 00:43:04 2012 @@ -143,6 +143,10 @@ Patch0: MAPREDUCE-3436_rev2.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n) BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils +# Sadly, Sun/Oracle JDK in RPM form doesn't provide libjvm.so, which means we have +# to set AutoReq to no in order to minimize confusion. Not ideal, but seems to work. +# I wish there was a way to disable just one auto dependency (libjvm.so) +AutoReq: no Provides: hadoop %if %{?suse_version:1}0