Author: bmahe
Date: Mon Jul 2 06:04:38 2012
New Revision: 1356075
URL: http://svn.apache.org/viewvc?rev=1356075&view=rev
Log:
BIGTOP-658. Move hbase dependency in hive out of the main package
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
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=1356075&r1=1356074&r2=1356075&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control Mon Jul 2
06:04:38 2012
@@ -17,13 +17,13 @@ Source: hive
Section: misc
Priority: extra
Maintainer: Bigtop <[email protected]>
-Build-Depends: debhelper (>= 6), ant, git-core
+Build-Depends: debhelper (>= 6), ant
Standards-Version: 3.8.0
Homepage: http://hive.apache.org/
Package: hive
Architecture: all
-Depends: adduser, hadoop-client, bigtop-utils, hbase, zookeeper
+Depends: adduser, hadoop-client, bigtop-utils, zookeeper
Description: Hive is 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 analysis of large
@@ -45,3 +45,9 @@ Architecture: all
Depends: hive (= ${source:Version})
Description: Shared metadata repository for Hive.
This optional package hosts a metadata server for Hive clients across a
network to use.
+
+Package: hive-hbase
+Architecture: all
+Depends: hive (= ${source:Version}), hbase
+Description: Provides integration between Apache HBase and Apache Hive
+ This optional package provides integration between Apache HBase and Apache
Hive
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules?rev=1356075&r1=1356074&r2=1356075&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules Mon Jul 2
06:04:38 2012
@@ -53,9 +53,11 @@ install-indep: metastore server
--prefix=debian/${hive_pkg_name} \
--build-dir=src/build/dist \
--doc-dir=debian/${hive_pkg_name}/usr/share/doc/${hive_pkg_name}
- # We need to get rid of jars that happen to be shipped in other CDH
packages
+ # We need to get rid of jars that happen to be shipped in other packages
rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/hbase-*.jar
debian/${hive_pkg_name}/usr/lib/hive/lib/zookeeper-*.jar
- ln -s /usr/lib/hbase/hbase.jar /usr/lib/zookeeper/zookeeper.jar
debian/${hive_pkg_name}/usr/lib/hive/lib
+ mkdir -p debian/${hive_pkg_name}-hbase/usr/lib/hive/lib
+ ln -s /usr/lib/hbase/hbase.jar
debian/${hive_pkg_name}-hbase/usr/lib/hive/lib
+ ln -s /usr/lib/zookeeper/zookeeper.jar
debian/${hive_pkg_name}/usr/lib/hive/lib
# Workaround for BIGTOP-583
rm -f debian/${hive_pkg_name}/usr/lib/hive/lib/slf4j-log4j12-*.jar
dh_install -i
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=1356075&r1=1356074&r2=1356075&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 Mon Jul
2 06:04:38 2012
@@ -115,6 +115,18 @@ Requires: redhat-lsb
This optional package hosts a metadata server for Hive clients across a
network to use.
+%package hbase
+Summary: Provides integration between Apache HBase and Apache Hive
+Group: Development/Libraries
+Provides: %{name}-server
+Requires: hbase
+
+
+%description hbase
+This optional package provides integration between Apache HBase and Apache Hive
+
+
+
%prep
%setup -n %{name}-%{hive_base_version}
@@ -196,6 +208,12 @@ fi
%attr(1777,hive,hive) %{var_lib_hive}/metastore
%doc %{doc_hive}
%{man_dir}/man1/hive.1.*
+%exclude %{usr_lib_hive}/lib/hbase.jar
+
+%files hbase
+%defattr(-,root,root,755)
+%{usr_lib_hive}/lib/hbase.jar
+
%define service_macro() \
%files %1 \
