Update pkgver() and provides as suggested to include tagged version

3 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6657077b3dc..cd56d45f8114 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = beancount-hg
 	pkgdesc = Double-Entry Accounting from Text Input
-	pkgver = r4435.17e54014214b
+	pkgver = 2.2.0.r2.9d7552d320a3
 	pkgrel = 1
 	url = http://furius.ca/beancount/
 	arch = i686
@@ -20,7 +20,7 @@ pkgbase = beancount-hg
 	depends = python-lxml
 	depends = python-google-api-python-client
 	provides = ledgerhub-hg
-	provides = beancount
+	provides = beancount=2.2.0
 	conflicts = beancount
 	replaces = ledgerhub-hg
 	source = beancount-hg::hg+https://bitbucket.org/blais/beancount/
diff --git a/.gitignore b/.gitignore
index b3731198effd..891b0aaef545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
-beancount-hg
+/beancount-hg/
+/pkg/
+/src/
+/*.log
+/*.tar
+/*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index f6b3f22fe328..5bee7288054a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adrian Perez <aperez@igalia.com>
 pkgname='beancount-hg'
 pkgdesc='Double-Entry Accounting from Text Input'
-pkgver=r4435.17e54014214b
+pkgver=2.2.0.r2.9d7552d320a3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://furius.ca/beancount/"
@@ -13,12 +13,12 @@ depends=('python>=3.5' 'mpdecimal' 'python-ply' 'python-dateutil'
 		 'python-bottle' 'python-lxml' 'python-google-api-python-client')
 makedepends=('mercurial' 'python-nose' 'make')
 replaces=('ledgerhub-hg')
-provides=('ledgerhub-hg' 'beancount')
+provides=('ledgerhub-hg' "beancount=${pkgver%%.r*}")
 conflicts=('beancount')
 
-pkgver () {
-	cd "${pkgname}"
-	printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
+pkgver() {
+  cd "${pkgname}"
+  hg log -r . --template '{latesttag}-{latesttagdistance}-{node|short}' | sed 's/^\([^-]*\)-\([^-]*\)-/\1.r\2./'
 }
 
 # TODO: Tests are failing at the moment, needs investigating.