Author: rvs
Date: Thu Sep 1 16:26:53 2011
New Revision: 1164137
URL: http://svn.apache.org/viewvc?rev=1164137&view=rev
Log:
BIGTOP-29. Remove java dependency from all os types
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control
incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control
incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control Thu Sep 1
16:26:53 2011
@@ -17,13 +17,13 @@ Source: flume
Section: misc
Priority: extra
Maintainer: Alex Newman <[email protected]>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core
Standards-Version: 3.8.0
Homepage: http://www.cloudera.com
Package: flume
Architecture: all
-Depends: sun-java6-jre, hadoop-zookeeper, adduser, hadoop
+Depends: hadoop-zookeeper, adduser, hadoop
Description: reliable, scalable, and manageable distributed data collection
application
Flume is a reliable, scalable, and manageable distributed data collection
application for collecting data such as logs and delivering it to data stores
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control Thu Sep 1
16:26:53 2011
@@ -17,14 +17,14 @@ Source: hadoop
Section: misc
Priority: extra
Maintainer: Todd Lipcon <[email protected]>
-Build-Depends: debhelper (>= 6), ant, ant-optional, liblzo2-dev,
sun-java6-jdk, python, libzip-dev,automake, autoconf (>= 2.61), sharutils, g++
(>= 4), git-core, libfuse-dev, libssl-dev
+Build-Depends: debhelper (>= 6), ant, ant-optional, liblzo2-dev, python,
libzip-dev,automake, autoconf (>= 2.61), sharutils, g++ (>= 4), git-core,
libfuse-dev, libssl-dev
Standards-Version: 3.8.0
Homepage: http://hadoop.apache.org/core/
Package: hadoop
Provides: hadoop
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, sun-java6-jre,
sun-java6-bin
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Recommends: hadoop-native
Description: A software platform for processing vast amounts of data
Hadoop is a software platform that lets one easily write and
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control Thu Sep 1
16:26:53 2011
@@ -16,13 +16,13 @@ Source: hadoop-hbase
Section: misc
Priority: extra
Maintainer: Alex Newman <[email protected]>
-Build-Depends: debhelper (>= 6), sun-java6-jdk, git-core, adduser
+Build-Depends: debhelper (>= 6), git-core, adduser
Standards-Version: 3.8.0
Homepage: http://hadoop.apache.org/hbase/
Package: hadoop-hbase
Architecture: all
-Depends: adduser, sun-java6-jre, hadoop-zookeeper (>= 3.3.1), hadoop
+Depends: adduser, hadoop-zookeeper (>= 3.3.1), hadoop
Recommends: ntp
Description: HBase is the Hadoop database
Use it when you need random, realtime read/write access to your Big Data.
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control Thu Sep 1
16:26:53 2011
@@ -17,13 +17,13 @@ Source: hadoop-hive
Section: misc
Priority: extra
Maintainer: Todd Lipcon <[email protected]>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, python-support, git-core
+Build-Depends: debhelper (>= 6), ant, python-support, git-core
Standards-Version: 3.8.0
Homepage: http://hadoop.apache.org/hive/
Package: hadoop-hive
Architecture: all
-Depends: adduser, sun-java6-jre, hadoop
+Depends: adduser, hadoop
Description: A data warehouse infrastructure built on top of Hadoop
Hive is a data warehouse infrastructure built on top of Hadoop that
provides tools to enable easy data summarization, adhoc querying and
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control Thu Sep 1
16:26:53 2011
@@ -17,7 +17,7 @@ Section: misc
Priority: extra
Maintainer: Arvind Prabhakar <[email protected]>
Build-Depends: debhelper (>= 6)
-Depends: zip, unzip, sun-java6-jre, sun-java6-bin
+Depends: zip, unzip
Standards-Version: 3.8.0
Homepage: http://archive.cloudera.com/cdh/3/oozie
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control Thu Sep 1
16:26:53 2011
@@ -2,13 +2,13 @@ Source: hadoop-pig
Section: misc
Priority: extra
Maintainer: Todd Lipcon <[email protected]>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core
Standards-Version: 3.8.0
Homepage: http://hadoop.apache.org/pig/
Package: hadoop-pig
Architecture: all
-Depends: sun-java6-jre, hadoop
+Depends: hadoop
Description: A platform for analyzing large data sets using Hadoop
Pig is a platform for analyzing large data sets that consists of a high-level
language
for expressing data analysis programs, coupled with infrastructure for
evaluating these
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control Thu Sep 1
16:26:53 2011
@@ -16,13 +16,13 @@ Source: sqoop
Section: misc
Priority: extra
Maintainer: Alex Newman <[email protected]>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core,
sed, asciidoc, xmlto
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core, sed, asciidoc,
xmlto
Standards-Version: 3.8.0
Homepage: http://www.cloudera.com
Package: sqoop
Architecture: all
-Depends: sun-java6-jre, hadoop
+Depends: hadoop
Description: Tool for easy imports and exports of data sets between databases
and HDFS
Sqoop is a tool that provides the ability to import and export data sets
between
the Hadoop Distributed File System (HDFS) and relational databases.
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control Thu Sep 1
16:26:53 2011
@@ -16,13 +16,12 @@ Source: whirr
Section: misc
Priority: extra
Maintainer: Tom White <[email protected]>
-Build-Depends: debhelper (>= 6), sun-java6-jdk, git-core
+Build-Depends: debhelper (>= 6), git-core
Standards-Version: 3.8.0
Homepage: http://incubator.apache.org/whirr
Package: whirr
Architecture: all
-Depends: sun-java6-jre
Description: Scripts and libraries for running software services on cloud
infrastructure
Whirr provides
.
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/control?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/control Thu Sep 1
16:26:53 2011
@@ -16,13 +16,12 @@ Source: hadoop-zookeeper
Section: misc
Priority: extra
Maintainer: Alex Newman <[email protected]>
-Build-Depends: debhelper (>= 6), ant, sun-java6-jdk, ant-optional, git-core,
autoconf, automake, subversion
+Build-Depends: debhelper (>= 6), ant, ant-optional, git-core, autoconf,
automake, subversion
Standards-Version: 3.8.0
Homepage: http://hadoop.apache.org/zookeeper/
Package: hadoop-zookeeper
Architecture: all
-Depends: sun-java6-jre
Conflicts: zookeeper
Replaces: zookeeper
Description: A high-performance coordination service for distributed
applications.
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Thu
Sep 1 16:26:53 2011
@@ -65,16 +65,6 @@ Source3: install_flume.sh
Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig,
/sbin/service, hadoop-zookeeper >= 3.3.1, hadoop >= 0.20.2
BuildRequires: ant xml-commons xml-commons-apis
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
%description
Flume is a reliable, scalable, and manageable distributed data collection
application for collecting data such as logs and delivering it to data stores
such as Hadoop's HDFS. It can efficiently collect, aggregate, and move large
amounts of log data. It has a simple, but flexible, architecture based on
streaming data flows. It is robust and fault tolerant with tunable reliability
mechanisms and many failover and recovery mechanisms. The system is centrally
managed and allows for intelligent dynamic management. It uses a simple
extensible data model that allows for online analytic applications.
@@ -87,13 +77,6 @@ Requires: sh-utils, textutils, /usr/sbin
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig, %{name}
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-Requires: java-1.6.0-sun
-%else
-Requires: jre >= 1.6
-%endif
-
%if %{?suse_version:1}0
# Required for init scripts
Requires: insserv
@@ -115,15 +98,6 @@ Requires: sh-utils, textutils, /usr/sbin
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig, %{name}
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%if %{?suse_version:1}0
# Required for init scripts
Requires: insserv
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Thu
Sep 1 16:26:53 2011
@@ -110,15 +110,6 @@ BuildRequires: python >= 2.4, git, fuse-
Requires: textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service
Provides: hadoop
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%if %{?suse_version:1}0
BuildRequires: libfuse2, libopenssl-devel, gcc-c++, ant, ant-nodeps, ant-trax,
liblzo-devel
# Required for init scripts
@@ -273,15 +264,6 @@ Requires: %{name} = %{version}-%{release
# TODO: reconcile libjvm
AutoReq: no
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%description libhdfs
Hadoop Filesystem Library
@@ -298,8 +280,8 @@ Hadoop Pipes Library
%setup -n %{name}-%{hadoop_base_version}
%build
-# This assumes that you installed Java JDK 6 via RPM
-# This assumes that you installed Java JDK 5 i386 via RPM
+# This assumes that you installed Java JDK 6 and set JAVA_HOME
+# This assumes that you installed Java JDK 5 and set JAVA5_HOME
# This assumes that you installed Forrest and set FORREST_HOME
ant -Dversion=%{version} \
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Thu
Sep 1 16:26:53 2011
@@ -68,15 +68,6 @@ Source4: install_hbase.sh
BuildArch: noarch
Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig,
/sbin/service, hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%description
HBase is an open-source, distributed, column-oriented store modeled after
Google' Bigtable: A Distributed Storage System for Structured Data by Chang et
al. Just as Bigtable leverages the distributed data storage provided by the
Google File System, HBase provides Bigtable-like capabilities on top of Hadoop.
HBase includes:
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Thu Sep
1 16:26:53 2011
@@ -70,15 +70,6 @@ Source6: hive-site.xml
Requires: hadoop >= 0.20.1
Obsoletes: %{name}-webinterface
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%description
Hive is a data warehouse infrastructure built on top of Hadoop that provides
tools to enable easy data summarization, adhoc querying and analysis of large
datasets data stored in Hadoop files. It provides a mechanism to put structure
on this data and it also provides a simple query language called Hive QL which
is based on SQL and which enables users familiar with SQL to query this data.
At the same time, this language also allows traditional map/reduce programmers
to be able to plug in their custom mappers and reducers to do more
sophisticated analysis which may not be supported by the built-in capabilities
of the language.
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Thu
Sep 1 16:26:53 2011
@@ -39,15 +39,6 @@ Requires(preun): /sbin/chkconfig, /sbin/
Requires: oozie-client = %{version}
BuildArch: noarch
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%description
Oozie is a system that runs workflows of Hadoop jobs.
Oozie workflows are actions arranged in a control dependency DAG (Direct
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Thu Sep
1 16:26:53 2011
@@ -81,16 +81,6 @@ Source3: pig.1
Source4: pig.properties
Requires: hadoop
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
%description
Pig is a platform for analyzing large data sets that consists of a high-level
language
for expressing data analysis programs, coupled with infrastructure for
evaluating these
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Thu
Sep 1 16:26:53 2011
@@ -43,15 +43,6 @@ Buildarch: noarch
BuildRequires: asciidoc, xmlto
Prereq: hadoop
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
%description
Sqoop allows easy imports and exports of data sets between databases and the
Hadoop Distributed File System (HDFS).
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Thu
Sep 1 16:26:53 2011
@@ -31,16 +31,6 @@ Source0: %{name}-%{whirr_base_version}-i
Source1: install_%{name}.sh
Source2: whirr.1
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
%description
Whirr provides
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1164137&r1=1164136&r2=1164137&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Thu Sep 1 16:26:53 2011
@@ -66,16 +66,6 @@ Source4: zookeeper.1
BuildArch: noarch
BuildRequires: autoconf, automake, subversion
-# RHEL6 provides natively java
-%if 0%{?rhel} == 6
-BuildRequires: java-1.6.0-sun-devel
-Requires: java-1.6.0-sun
-%else
-BuildRequires: jdk >= 1.6
-Requires: jre >= 1.6
-%endif
-
-
%description
ZooKeeper is a centralized service for maintaining configuration information,
naming, providing distributed synchronization, and providing group services.
