Updated to v2.5.0

1 files changed, 36 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ada245faa1bc..7c09d98805eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Gilles Hamel <hamelg at laposte dot net>
 _pkgname=grafana
 pkgname=${_pkgname}-git
-pkgver=v2.0.2.r566.ga386733
-pkgrel=2
+pkgver=v2.5.0.r23.g59fc72d
+pkgrel=1
 pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb"
 url="http://grafana.org"
 arch=('x86_64' 'i686')
 license=('APACHE')
-depends=(phantomjs)
-makedepends=(go nodejs-grunt-cli)
+depends=()
+makedepends=(go godep nodejs-grunt-cli npm)
 provides=grafana
 conflicts=grafana
 install=${_pkgname}.install
@@ -27,38 +27,42 @@ pkgver() {
 }
 
 prepare () {
-  cd "${_pkgname}"	
-  patch -p1 -i "${srcdir}"/config.patch
-  #patch -p1 -i "${srcdir}"/0001-Replaced-slug-dependency-with-one-that-did-not-use-g.patch
+	cd "${_pkgname}"
+	patch -p1 -i "${srcdir}"/config.patch
 }
 
 build() {
-  export GOPATH="${srcdir}/${_pkgname}"
-  export PATH="$PATH:$GOPATH/bin"
-  cd "$GOPATH"
-  go run build.go setup
-  godep restore
-  mkdir -p "$GOPATH/src/github.com/grafana/grafana/"
-  ln -s "$GOPATH/pkg" "$GOPATH/src/github.com/grafana/grafana/"
-  # build less to css for the frontend 
-  npm install
-  #grunt
-  # build the backend
-  # no longer doing package build since this just kicks off rpm/deb builds at the end.
-  #go run build.go build package
-  go run build.go build
-  grunt build
-  grunt build-post-process
+	export GOPATH="${srcdir}/${_pkgname}"
+	export PATH="$PATH:$GOPATH/bin"
+	cd "$GOPATH"
+	go run build.go setup
+	godep restore
+	mkdir -p "$GOPATH/src/github.com/grafana/grafana/"
+	ln -s "$GOPATH/pkg" "$GOPATH/src/github.com/grafana/grafana/"
+
+	# Build frontend assets
+	npm install
+	# Install phantomjs in this directory as well for some reason
+	cd node_modules/karma-phantomjs-launcher
+	npm install
+	cd "$GOPATH"
+	grunt
+	grunt build
+	grunt build-post-process
+
+	# build the backend
+	# no longer doing package build since this just kicks off rpm/deb builds at the end.
+	#go run build.go build package
+	go run build.go build
 }
 
 package() {
-  install -Dm644 "${srcdir}/grafana.service" "$pkgdir/usr/lib/systemd/system/grafana.service"
-  cd "${srcdir}/${_pkgname}"
-  install -dm755 "${pkgdir}/var/lib/grafana"
-  install -dm755 "${pkgdir}/var/log/grafana"
-  install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
-  install -Dm644 tmp/conf/sample.ini "$pkgdir/etc/${_pkgname}/${_pkgname}.ini"
-  install -Dm644 tmp/conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini"
-  cp -r tmp/public tmp/vendor "$pkgdir/usr/share/grafana/"
-  rm "$pkgdir/usr/share/grafana/vendor/phantomjs/phantomjs"
+	install -Dm644 "${srcdir}/grafana.service" "$pkgdir/usr/lib/systemd/system/grafana.service"
+	cd "${srcdir}/${_pkgname}"
+	install -dm755 "${pkgdir}/var/lib/grafana"
+	install -dm755 "${pkgdir}/var/log/grafana"
+	install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
+	install -Dm644 conf/sample.ini "$pkgdir/etc/${_pkgname}/${_pkgname}.ini"
+	install -Dm644 conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini"
+	cp -r public vendor "$pkgdir/usr/share/grafana/"
 }