bump to 0.12.1 and fix pkgver

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e5495185b85..d5edc19cd939 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Fri Mar 18 20:20:47 UTC 2016
+# Sat Oct  8 22:48:18 UTC 2016
 pkgbase = bitcoind-unlimited-git
 	pkgdesc = Bitcoin Unlimited versions of bitcoind, bitcoin-cli, and bitcoin-tx
-	pkgver = 20160315.9b1890e
-	pkgrel = 2
-	url = http://www.bitcoinunlimited.info/software
+	pkgver = 0.12.1
+	pkgrel = 1
+	url = http://www.bitcoinunlimited.info
 	install = bitcoin.install
 	arch = any
 	license = MIT
@@ -34,7 +34,7 @@ pkgbase = bitcoind-unlimited-git
 	conflicts = bitcoin-tx
 	backup = etc/bitcoin/bitcoin.conf
 	backup = etc/logrotate.d/bitcoin
-	source = git+https://github.com/BitcoinUnlimited/BitcoinUnlimited.git#branch=0.12bu
+	source = git+https://github.com/BitcoinUnlimited/BitcoinUnlimited.git#branch=0.12.1bu
 	source = bitcoin.conf
 	source = bitcoin.logrotate
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fb4c09288c84..f7fb8c7e150a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 pkgname=bitcoind-unlimited-git
-pkgver=20160315.9b1890e
-pkgrel=2
+pkgver=0.12.1
+pkgrel=1
 pkgdesc="Bitcoin Unlimited versions of bitcoind, bitcoin-cli, and bitcoin-tx"
 arch=('any')
 url="http://www.bitcoinunlimited.info"
@@ -22,7 +22,7 @@ makedepends=('autoconf'
              'make'
              'pkg-config')
 license=('MIT')
-source=(git+https://github.com/BitcoinUnlimited/BitcoinUnlimited.git#branch=0.12bu
+source=(git+https://github.com/BitcoinUnlimited/BitcoinUnlimited.git#branch=0.12.1bu
         bitcoin.conf
         bitcoin.logrotate)
 sha256sums=('SKIP'
@@ -40,7 +40,10 @@ install=bitcoin.install
 
 pkgver() {
 	cd "$srcdir/BitcoinUnlimited"
-  git log -1 --date=short --format="%cd.%h" | sed "s|-||g"
+
+  # The latest version was not tagged, so throw away the version we get
+  # from the top-most tag, but keep,the revision height and commit hash
+  git describe --long | sed "s/^v[^-]\+-\([0-9]\+\)/$pkgver.r\1/;s/-/./g"
 }
 
 build() {