Author: bmahe
Date: Wed Oct 12 06:58:31 2011
New Revision: 1182235
URL: http://svn.apache.org/viewvc?rev=1182235&view=rev
Log:
BIGTOP-112. Fixes for Mageia
* Fix zlib dependency for Mageia
* Replace textutils dependency by coreutils
Modified:
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
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=1182235&r1=1182234&r2=1182235&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 Wed
Oct 12 06:58:31 2011
@@ -63,9 +63,15 @@ Source1: do-component-build
Source2: install_%{name}.sh
Source3: init.d
Source4: init.d.suse
-Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig,
/sbin/service, hadoop-zookeeper >= 3.3.1, hadoop >= 0.20.2
+Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service,
hadoop-zookeeper >= 3.3.1, hadoop >= 0.20.2
BuildRequires: ant xml-commons xml-commons-apis
+%if 0%{?mgaversion}
+Requires: bsh-utils
+%else
+Requires: sh-utils
+%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.
@@ -74,7 +80,7 @@ Summary: The flume master daemon is the
Group: Development/Libraries
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
-Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig,
/sbin/service
+Requires: /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig, %{name}
@@ -95,7 +101,7 @@ Summary: The flume node daemon is a core
Group: Development/Libraries
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
-Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig,
/sbin/service
+Requires: /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig, %{name}
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=1182235&r1=1182234&r2=1182235&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
Oct 12 06:58:31 2011
@@ -109,7 +109,7 @@ Source7: hadoop-fuse-dfs.1
Source8: hadoop-fuse.default
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
-Requires: textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service
+Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service
Provides: hadoop
%if %{?suse_version:1}0
@@ -127,8 +127,8 @@ Requires: sh-utils, redhat-lsb
%endif
%if 0%{?mgaversion}
-BuildRequires: libfuse-devel, libfuse2 , libopenssl-devel, gcc-c++, ant,
libtool, automake, autoconf, liblzo-devel, libzlib-devel
-Requires: chkconfig, xinetd-simple-services, libzlib
+BuildRequires: libfuse-devel, libfuse2 , libopenssl-devel, gcc-c++, ant,
libtool, automake, autoconf, liblzo-devel, zlib-devel
+Requires: chkconfig, xinetd-simple-services, zlib
%endif
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=1182235&r1=1182234&r2=1182235&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 Wed
Oct 12 06:58:31 2011
@@ -67,7 +67,14 @@ Source3: hadoop-hbase.sh
Source4: hadoop-hbase.sh.suse
Source5: hbase.default
BuildArch: noarch
-Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig,
/sbin/service, hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1
+Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service,
hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1
+
+%if 0%{?mgaversion}
+Requires: bsh-utils
+%else
+Requires: sh-utils
+%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:
