Add source location, package conflict info, and git version info

2 files changed, 18 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 730867f64567..7570e4b15dbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 # Generated by mksrcinfo v8
-# Fri Apr  7 09:40:40 UTC 2017
+# Fri Apr  7 09:47:00 UTC 2017
 pkgbase = mastodon-git
 	pkgdesc = A GNU Social-compatible microblogging server
-	pkgver = 1.0
-	pkgrel = 0.1
+	pkgver = 1.0_584_g1c351709
+	pkgrel = 1
 	url = https://mastodon.social
 	arch = i686
 	arch = x86_64
 	license = AGPL-3.0
+	conflicts = mastodon
+	source = git://github.com/tootsuite/mastodon.git#branch=master
+	sha256sums = SKIP
 
 pkgname = mastodon-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c559968cd032..153ee04f8091 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,19 @@
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=mastodon-git
-pkgver=1.0
-pkgrel=0.1
+pkgver=1.0_584_g1c351709
+_branch=master
+pkgrel=1
 pkgdesc="A GNU Social-compatible microblogging server"
 arch=('i686' 'x86_64')
 url="https://mastodon.social"
 license=('AGPL-3.0')
+conflicts=("${pkgname%-git}")
+source=("git://github.com/tootsuite/${pkgname%-git}.git#branch=$_branch")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${pkgname%-git}"
+  git describe --long --tags | sed 's/^v//;s/-/_/g'
+}
+