You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/05/23 17:49:27 UTC
svn commit: r1341911 - in /incubator/bigtop/trunk/bigtop-packages/src:
deb/hadoop/control rpm/hadoop/SPECS/hadoop.spec
Author: rvs
Date: Wed May 23 15:49:27 2012
New Revision: 1341911
URL: http://svn.apache.org/viewvc?rev=1341911&view=rev
Log:
BIGTOP-574 - add netcat and fuser as dependencies for hadoop
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
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=1341911&r1=1341910&r2=1341911&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control Wed May 23 15:49:27 2012
@@ -24,7 +24,7 @@ Homepage: http://hadoop.apache.org/core/
Package: hadoop
Provides: hadoop
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, zookeeper (>= 3.4.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, bigtop-utils, zookeeper (>= 3.4.0), psmisc, netcat-openbsd
Description: Hadoop is a software platform for processing vast amounts of data
Hadoop is a software platform that lets one easily write and
run applications that process vast amounts of data.
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=1341911&r1=1341910&r2=1341911&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 Wed May 23 15:49:27 2012
@@ -86,7 +86,7 @@
/usr/lib/rpm/brp-python-bytecompile ; \
%{nil}
-
+%define netcat_package nc
%define libexecdir %{_libexecdir}
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define alternatives_cmd alternatives
@@ -107,6 +107,7 @@
/usr/lib/rpm/brp-compress ; \
%{nil}
+%define netcat_package netcat-openbsd
%define libexecdir /usr/lib
%define doc_hadoop %{_docdir}/%{name}
%define alternatives_cmd update-alternatives
@@ -114,6 +115,7 @@
%endif
%if 0%{?mgaversion}
+%define netcat_package netcat-openbsd
%define libexecdir /usr/libexec/
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define alternatives_cmd update-alternatives
@@ -164,6 +166,7 @@ Source23: hadoop-hdfs-zkfc.svc
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, zookeeper >= 3.4.0
+Requires: psmisc, %{netcat_package}
# 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)