BIGTOP-785. clean up build-time dependencies in our packages
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/627ed1d7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/627ed1d7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/627ed1d7 Branch: refs/heads/master Commit: 627ed1d7273f518db8f952db9ee9d1cd52fcc181 Parents: fe1f77a Author: Roman Shaposhnik <[email protected]> Authored: Thu Nov 15 09:32:34 2012 -0800 Committer: Roman Shaposhnik <[email protected]> Committed: Thu Nov 15 09:32:34 2012 -0800 ---------------------------------------------------------------------- bigtop-packages/src/deb/giraph/control | 2 +- bigtop-packages/src/deb/hadoop/control | 2 +- bigtop-packages/src/deb/hbase/control | 2 +- bigtop-packages/src/deb/hive/control | 2 +- bigtop-packages/src/deb/hue/control | 5 +++-- bigtop-packages/src/deb/mahout/control | 2 +- bigtop-packages/src/deb/pig/control | 2 +- bigtop-packages/src/deb/solr/control | 2 +- bigtop-packages/src/deb/sqoop/control | 2 +- bigtop-packages/src/deb/whirr/control | 2 +- bigtop-packages/src/deb/zookeeper/control | 2 +- .../src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec | 2 +- bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 8 ++++---- .../src/rpm/zookeeper/SPECS/zookeeper.spec | 2 +- 14 files changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/giraph/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/giraph/control b/bigtop-packages/src/deb/giraph/control index 53371ca..686a052 100644 --- a/bigtop-packages/src/deb/giraph/control +++ b/bigtop-packages/src/deb/giraph/control @@ -17,7 +17,7 @@ Source: giraph Section: misc Priority: extra Maintainer: Apache Bigtopr <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), git-core +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/giraph/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/hadoop/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hadoop/control b/bigtop-packages/src/deb/hadoop/control index 3821da9..8e019b3 100644 --- a/bigtop-packages/src/deb/hadoop/control +++ b/bigtop-packages/src/deb/hadoop/control @@ -17,7 +17,7 @@ Source: hadoop Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, liblzo2-dev, python, libzip-dev, sharutils, g++ (>= 4), git-core, libfuse-dev, libssl-dev, cmake, pkg-config +Build-Depends: debhelper (>= 7.0.50~), liblzo2-dev, libzip-dev, sharutils, g++ (>= 4), libfuse-dev, libssl-dev, cmake, pkg-config Standards-Version: 3.8.0 Homepage: http://hadoop.apache.org/core/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/hbase/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control index f9572c8..f8a6158 100644 --- a/bigtop-packages/src/deb/hbase/control +++ b/bigtop-packages/src/deb/hbase/control @@ -16,7 +16,7 @@ Source: hbase Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), git-core, adduser +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://hbase.apache.org/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/hive/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hive/control b/bigtop-packages/src/deb/hive/control index d51d4d3..222301e 100644 --- a/bigtop-packages/src/deb/hive/control +++ b/bigtop-packages/src/deb/hive/control @@ -17,7 +17,7 @@ Source: hive Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), ant +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://hive.apache.org/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/hue/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hue/control b/bigtop-packages/src/deb/hue/control index b139ecb..7b9bc94 100644 --- a/bigtop-packages/src/deb/hue/control +++ b/bigtop-packages/src/deb/hue/control @@ -17,8 +17,9 @@ Source: hue Section: misc Priority: extra Maintainer: Apache Bigtopr <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), ant, python2.4-dev | python2.5-dev | python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools, libkrb5-dev -Depends: libsasl2, libsqlite3, zlib1g, libxslt1, libxml2Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 7.0.50~), python2.4-dev | python2.5-dev | python2.6-dev | python2.7-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, libsqlite3-dev, libldap2-dev, libsasl2-dev, libmysqlclient-dev, make, python-setuptools, libkrb5-dev +Depends: libsasl2, libsqlite3, zlib1g, libxslt1, libxml2 +Standards-Version: 3.8.0 Homepage: http://github.com/cloudera/hue Package: hue-common http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/mahout/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/mahout/control b/bigtop-packages/src/deb/mahout/control index d42b02b..744c4b7 100644 --- a/bigtop-packages/src/deb/mahout/control +++ b/bigtop-packages/src/deb/mahout/control @@ -17,7 +17,7 @@ Source: mahout Section: misc Priority: extra Maintainer: Andrew Bayer <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), git-core +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://mahout.apache.org http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/pig/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/pig/control b/bigtop-packages/src/deb/pig/control index 666c3d6..43c4932 100644 --- a/bigtop-packages/src/deb/pig/control +++ b/bigtop-packages/src/deb/pig/control @@ -17,7 +17,7 @@ Source: pig Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://pig.apache.org/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/solr/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/solr/control b/bigtop-packages/src/deb/solr/control index 458fd13..18db11b 100644 --- a/bigtop-packages/src/deb/solr/control +++ b/bigtop-packages/src/deb/solr/control @@ -17,7 +17,7 @@ Source: solr Section: misc Priority: extra Maintainer: Apache Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), git-core +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://lucene.apache.org/solr http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/sqoop/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/sqoop/control b/bigtop-packages/src/deb/sqoop/control index b64a2c5..dcc6106 100644 --- a/bigtop-packages/src/deb/sqoop/control +++ b/bigtop-packages/src/deb/sqoop/control @@ -16,7 +16,7 @@ Source: sqoop Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, git-core, sed, asciidoc, xmlto +Build-Depends: debhelper (>= 7.0.50~), asciidoc, xmlto Standards-Version: 3.8.0 Homepage: http://incubator.apache.org/sqoop/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/whirr/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/whirr/control b/bigtop-packages/src/deb/whirr/control index 988e042..de24f7a 100644 --- a/bigtop-packages/src/deb/whirr/control +++ b/bigtop-packages/src/deb/whirr/control @@ -16,7 +16,7 @@ Source: whirr Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), git-core +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.0 Homepage: http://whirr.apache.org/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/deb/zookeeper/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/control b/bigtop-packages/src/deb/zookeeper/control index 4acff6d..ff70ebc 100755 --- a/bigtop-packages/src/deb/zookeeper/control +++ b/bigtop-packages/src/deb/zookeeper/control @@ -16,7 +16,7 @@ Source: zookeeper Section: misc Priority: extra Maintainer: Bigtop <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), ant, ant-optional, autoconf, automake +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake Standards-Version: 3.8.0 Homepage: http://zookeeper.apache.org/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec b/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec index d0d015b..dc301ec 100644 --- a/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec +++ b/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec @@ -33,7 +33,7 @@ License: ASL 2.0 Source0: commons-daemon-%{bigtop_jsvc_base_version}.tar.gz Source1: do-component-build Source2: install_jsvc.sh -BuildRequires: ant, autoconf, automake, gcc +BuildRequires: autoconf, automake, gcc %description jsvc executes classfile that implements a Daemon interface. http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec index fe04f21..334dd4e 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -164,7 +164,7 @@ Source21: yarn.default Source22: hadoop-layout.sh Source23: hadoop-hdfs-zkfc.svc Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n) -BuildRequires: python >= 2.4, git, fuse-devel, fuse, cmake +BuildRequires: fuse-devel, fuse, cmake 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 @@ -173,7 +173,7 @@ Requires: psmisc, %{netcat_package} AutoReq: no %if %{?suse_version:1}0 -BuildRequires: pkg-config, libfuse2, libopenssl-devel, gcc-c++, ant, ant-nodeps, ant-trax +BuildRequires: pkg-config, libfuse2, libopenssl-devel, gcc-c++ # Required for init scripts Requires: sh-utils, insserv %endif @@ -181,13 +181,13 @@ Requires: sh-utils, insserv # CentOS 5 does not have any dist macro # So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora %if %{!?suse_version:1}0 && %{!?mgaversion:1}0 -BuildRequires: pkgconfig, fuse-libs, libtool, redhat-rpm-config, lzo-devel, openssl-devel +BuildRequires: pkgconfig, fuse-libs, redhat-rpm-config, lzo-devel, openssl-devel # Required for init scripts Requires: sh-utils, redhat-lsb %endif %if 0%{?mgaversion} -BuildRequires: pkgconfig, libfuse-devel, libfuse2 , libopenssl-devel, gcc-c++, ant, liblzo-devel, zlib-devel +BuildRequires: pkgconfig, libfuse-devel, libfuse2 , libopenssl-devel, gcc-c++, liblzo-devel, zlib-devel Requires: chkconfig, xinetd-simple-services, zlib, initscripts %endif http://git-wip-us.apache.org/repos/asf/bigtop/blob/627ed1d7/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec index 4eddece..c11acb6 100644 --- a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec +++ b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec @@ -75,7 +75,7 @@ Source4: zookeeper-server.sh.suse Source5: zookeeper.1 Source6: zoo.cfg BuildArch: noarch -BuildRequires: ant, autoconf, automake +BuildRequires: autoconf, automake Requires(pre): coreutils, shadow-utils, /usr/sbin/groupadd, /usr/sbin/useradd Requires(post): %{alternatives_dep} Requires(preun): %{alternatives_dep}
