Author: rvs
Date: Mon May 14 18:02:43 2012
New Revision: 1338316
URL: http://svn.apache.org/viewvc?rev=1338316&view=rev
Log:
Bumping version of Mahout to 0.7-incubating
Removed:
incubator/bigtop/trunk/bigtop-packages/src/common/mahout/MAHOUT-822.patch
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
incubator/bigtop/trunk/bigtop.mk
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build?rev=1338316&r1=1338315&r2=1338316&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
Mon May 14 18:02:43 2012
@@ -16,7 +16,7 @@
set -ex
-mvn clean install -Dmahout.skip.distribution=false -DskipTests
-Dhadoop.version=0.23.1 "$@"
+mvn clean install -Dmahout.skip.distribution=false -DskipTests
-Dhadoop.version=2.0.0-SNAPSHOT "$@"
mkdir build
for i in distribution/target/mahout*.tar.gz ; do
tar -C build --strip-components=1 -xzf $i
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=1338316&r1=1338315&r2=1338316&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules Mon May 14
18:02:43 2012
@@ -25,7 +25,6 @@ export DH_OPTIONS
patch: patch-stamp
patch-stamp:
- patch -p0 < debian/MAHOUT-822.patch
touch $@
clean:
@@ -50,8 +49,8 @@ install-indep:
--build-dir=build \
--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
+ rm -rf debian/mahout/usr/lib/mahout/lib/slf4j-*.jar
debian/mahout/usr/lib/mahout/lib/hadoop
+ ln -fs /usr/lib/hadoop/client debian/mahout/usr/lib/mahout/lib/hadoop
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=1338316&r1=1338315&r2=1338316&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 Mon
May 14 18:02:43 2012
@@ -66,8 +66,8 @@ diverse community to facilitate discussi
also on potential use cases. Come to the mailing lists to find out more.
%prep
-%setup -n %{name}-distribution-%{mahout_base_version}
-%patch0 -p0
+#%setup -n %{name}-distribution-%{mahout_base_version}
+%setup -n apache-mahout-72ad12d
%build
bash $RPM_SOURCE_DIR/do-component-build
@@ -78,8 +78,8 @@ sh $RPM_SOURCE_DIR/install_mahout.sh \
--build-dir=build \
--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
+rm -rf $RPM_BUILD_ROOT/usr/lib/mahout/lib/slf4j-*.jar
$RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop
+ln -fs /usr/lib/hadoop/client $RPM_BUILD_ROOT/usr/lib/mahout/lib/hadoop
%post
%{alternatives_cmd} --install %{config_mahout} %{mahout_name}-conf
%{config_mahout}.dist 30
Modified: incubator/bigtop/trunk/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1338316&r1=1338315&r2=1338316&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Mon May 14 18:02:43 2012
@@ -132,14 +132,17 @@ $(eval $(call PACKAGE,whirr,WHIRR))
MAHOUT_NAME=mahout
MAHOUT_RELNOTES_NAME=Apache Mahout
MAHOUT_PKG_NAME=mahout
-MAHOUT_BASE_VERSION=0.6
-MAHOUT_PKG_VERSION=0.6
+MAHOUT_BASE_VERSION=0.7
+MAHOUT_PKG_VERSION=0.7
MAHOUT_RELEASE_VERSION=1
MAHOUT_TARBALL_DST=mahout-distribution-$(MAHOUT_BASE_VERSION)-src.tar.gz
-MAHOUT_TARBALL_SRC=$(MAHOUT_TARBALL_DST)
-MAHOUT_DOWNLOAD_PATH=/mahout/$(MAHOUT_BASE_VERSION)
-MAHOUT_SITE=$(APACHE_MIRROR)$(MAHOUT_DOWNLOAD_PATH)
-MAHOUT_ARCHIVE=$(APACHE_ARCHIVE)$(MAHOUT_DOWNLOAD_PATH)
+#MAHOUT_TARBALL_SRC=$(MAHOUT_TARBALL_DST)
+#MAHOUT_DOWNLOAD_PATH=/mahout/$(MAHOUT_BASE_VERSION)
+#MAHOUT_SITE=$(APACHE_MIRROR)$(MAHOUT_DOWNLOAD_PATH)
+#MAHOUT_ARCHIVE=$(APACHE_ARCHIVE)$(MAHOUT_DOWNLOAD_PATH)
+MAHOUT_TARBALL_SRC=72ad12d
+MAHOUT_SITE=https://github.com/apache/mahout/tarball
+MAHOUT_ARCHIVE=$(MAHOUT_SITE)
$(eval $(call PACKAGE,mahout,MAHOUT))
# Flume
