Author: abayer
Date: Fri Sep 9 17:37:18 2011
New Revision: 1167305
URL: http://svn.apache.org/viewvc?rev=1167305&view=rev
Log:
Fixes BIGTOP-88. Use Hadoop package's hadoop jar in classpath.
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules?rev=1167305&r1=1167304&r2=1167305&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules Fri Sep 9
17:37:18 2011
@@ -52,6 +52,8 @@ install-indep:
--build-dir=debian/tmp \
--doc-dir=/usr/share/doc/mahout \
--prefix=debian/mahout
+ rm debian/mahout/usr/lib/mahout/lib/hadoop-*.jar
+ ln -s /usr/lib/hadoop/hadoop-core.jar
debian/mahout/usr/lib/mahout/lib/hadoop-core.jar
dh_install -i
(dh_lintian) || /bin/true
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1167305&r1=1167304&r2=1167305&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec Fri
Sep 9 17:37:18 2011
@@ -75,6 +75,8 @@ sh $RPM_SOURCE_DIR/install_mahout.sh \
--build-dir=distribution/target/mahout-distribution-%{mahout_base_version}/mahout-distribution-%{mahout_base_version}
\
--prefix=$RPM_BUILD_ROOT \
--doc-dir=%{doc_mahout}
+rm -f $RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop*.jar
+ln -s /usr/lib/hadoop/hadoop-core.jar
$RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop-core.jar
%post
%{alternatives_cmd} --install %{config_mahout} %{mahout_name}-conf
%{config_mahout}.dist 30
