Re: git commit: BIGTOP-1074. Bump version of Hue to 2.5.0

[Bruno Mahé]

On 09/18/2013 04:56 PM, r...@apache.org wrote:

Updated Branches:
   refs/heads/master 6417c31af -> 4826b789e


BIGTOP-1074. Bump version of Hue to 2.5.0


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/4826b789
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/4826b789
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/4826b789

Branch: refs/heads/master
Commit: 4826b789e6a3c841eb9bb19990da3b50a38eb5d0
Parents: 6417c31
Author: Roman Shaposhnik <r...@cloudera.com>
Authored: Wed Sep 18 16:55:36 2013 -0700
Committer: Roman Shaposhnik <r...@cloudera.com>
Committed: Wed Sep 18 16:55:36 2013 -0700

----------------------------------------------------------------------
  bigtop-packages/src/common/hue/do-component-build | 2 +-
  bigtop-packages/src/deb/hue/rules                 | 2 +-
  bigtop-packages/src/rpm/hue/SPECS/hue.spec        | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/4826b789/bigtop-packages/src/common/hue/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hue/do-component-build 
b/bigtop-packages/src/common/hue/do-component-build
index e4cdeca..c81958c 100644
--- a/bigtop-packages/src/common/hue/do-component-build
+++ b/bigtop-packages/src/common/hue/do-component-build
@@ -17,7 +17,7 @@
  set -ex

  #FIXME: this needs to be fixed upstream
-sed -i -e 's#2.5.0-SNAPSHOT#'${HUE_VERSION}'#g' `grep -lR 2.5.0-SNAPSHOT .`
+sed -i -e 's#2.5.0-SNAPSHOT#'${FULL_VERSION}'#g' `grep -lR 2.5.0-SNAPSHOT .`

  make MAVEN_VERSION='$(DESKTOP_VERSION)' apps


http://git-wip-us.apache.org/repos/asf/bigtop/blob/4826b789/bigtop-packages/src/deb/hue/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hue/rules 
b/bigtop-packages/src/deb/hue/rules
index 5c959ab..cf86421 100755
--- a/bigtop-packages/src/deb/hue/rules
+++ b/bigtop-packages/src/deb/hue/rules
@@ -35,7 +35,7 @@ $(APPS:%=debian/hue-%.prerm): debian/hue-app.prerm.tpl
        dh $@

  override_dh_auto_build:
-       bash -x debian/do-component-build 
-Dmaven.repo.local=${HOME}/.m2/repository
+       env FULL_VERSION=${HUE_BASE_VERSION} bash -x debian/do-component-build 
-Dmaven.repo.local=${HOME}/.m2/repository

  override_dh_auto_install: build $(APPS:%=debian/hue-%.postinst) 
$(APPS:%=debian/hue-%.prerm)
        bash -x debian/install_hue.sh --build-dir=${PWD} 
--prefix=${PWD}/debian/tmp

http://git-wip-us.apache.org/repos/asf/bigtop/blob/4826b789/bigtop-packages/src/rpm/hue/SPECS/hue.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec 
b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
index dd879db..de42aee 100644
--- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec
+++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec
@@ -144,7 +144,7 @@ It supports a file browser, job tracker interface, cluster 
health monitor, and m
  # Build
  ########################################
  %build
-bash -x %{SOURCE3}
+env FULL_VERSION=%{hue_base_version} bash -x %{SOURCE3}

  ########################################
  # Install

Forgot to put a patch on JIRA?