riemann: build from source, precompiled shipped separately

3 files changed, 33 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0c00f391a19..f89ecd464c09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,26 @@
+# Generated by mksrcinfo v8
+# Fri Mar  4 04:01:36 UTC 2016
 pkgbase = riemann
 	pkgdesc = Monitors distributed systems
 	pkgver = 0.2.10
-	pkgrel = 1
+	pkgrel = 2
 	url = http://riemann.io/
 	install = riemann.install
 	arch = any
 	license = EPL
+	makedepends = leiningen
 	depends = java-runtime
 	depends = bash
+	provides = riemann
+	conflicts = riemann-bin
 	backup = etc/riemann/riemann.config
-	source = https://aphyr.com/riemann/riemann-0.2.10.tar.bz2
+	source = https://github.com/riemann/riemann/archive/0.2.10.tar.gz
 	source = logging.patch
 	source = riemann.install
 	source = riemann.sysusers
 	source = riemann.service
-	sha256sums = ec697519e80781dc478983de04204760f2790da1715acfd233b35da071be5455
-	sha256sums = 0e1a10f59cc95f9cef3eb54cc9764366a714eec2ed6c08750ac13c5d456d69c5
+	sha256sums = db59583e69a6da9a222f73bae753665e9a4924883ce6c516b9fa56d536448340
+	sha256sums = 30c09cf2432f5cc49cbd77576c6fc3251495b2862e51d81af2ab71109c2706f8
 	sha256sums = c62dfdd9c723e0717d5da33dc85def9a9a8f623f671aafa9505df3790bb4d2ae
 	sha256sums = 18e21c05c351a8bcbd55b3a454bceb67b7dcfe1385e7cca6936fe63640c44303
 	sha256sums = 94181e635ae9774a76bf4169064f253b626fb09806694d34774ed06d54df35b8
diff --git a/PKGBUILD b/PKGBUILD
index c8101c39ae23..225229eda619 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,24 @@
 
 pkgname=riemann
 pkgver=0.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Monitors distributed systems"
 arch=('any')
-url="http://riemann.io/"
+url="http://$pkgname.io/"
 license=('EPL')
 depends=('java-runtime' 'bash')
-install='riemann.install'
-source=("https://aphyr.com/riemann/$pkgname-$pkgver.tar.bz2"
+makedepends=('leiningen')
+provides=('riemann')
+conflicts=('riemann-bin')
+install="$pkgname.install"
+source=("https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz"
         'logging.patch'
-        'riemann.install'
-        'riemann.sysusers'
-        'riemann.service')
-backup=('etc/riemann/riemann.config')
-sha256sums=('ec697519e80781dc478983de04204760f2790da1715acfd233b35da071be5455'
-            '0e1a10f59cc95f9cef3eb54cc9764366a714eec2ed6c08750ac13c5d456d69c5'
+        "$pkgname.install"
+        "$pkgname.sysusers"
+        "$pkgname.service")
+backup=("etc/$pkgname/$pkgname.config")
+sha256sums=('db59583e69a6da9a222f73bae753665e9a4924883ce6c516b9fa56d536448340'
+            '30c09cf2432f5cc49cbd77576c6fc3251495b2862e51d81af2ab71109c2706f8'
             'c62dfdd9c723e0717d5da33dc85def9a9a8f623f671aafa9505df3790bb4d2ae'
             '18e21c05c351a8bcbd55b3a454bceb67b7dcfe1385e7cca6936fe63640c44303'
             '94181e635ae9774a76bf4169064f253b626fb09806694d34774ed06d54df35b8')
@@ -31,16 +34,21 @@ prepare() {
   done
 }
 
-# No build() function; riemann provides .jar artifacts
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    lein uberjar
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   install -dm755 "$pkgdir/var/log/riemann"
 
-  install -Dm644 etc/riemann.config "$pkgdir/etc/riemann/riemann.config"
-  install -Dm755 bin/riemann        "$pkgdir/usr/bin/riemann"
-  install -Dm644 lib/riemann.jar    "$pkgdir/usr/lib/riemann.jar"
+  install -Dm644 pkg/tar/riemann.config "$pkgdir/etc/riemann/riemann.config"
+  install -Dm755 pkg/tar/riemann        "$pkgdir/usr/bin/riemann"
+  install -Dm644 target/riemann-$pkgver-standalone.jar \
+                 "$pkgdir/usr/lib/riemann.jar"
 
   install -Dm644 "$srcdir/riemann.service" \
                  "$pkgdir/usr/lib/systemd/system/riemann.service"
diff --git a/logging.patch b/logging.patch
index e18936e39635..ddc425648ed5 100644
--- a/logging.patch
+++ b/logging.patch
@@ -1,5 +1,5 @@
---- a/etc/riemann.config
-+++ b/etc/riemann.config
+--- a/pkg/tar/riemann.config
++++ b/pkg/tar/riemann.config
 @@ -3,3 +3,3 @@
 
 -(logging/init {:file "riemann.log"})