Normalize version strings generated by pkgver()

This makes the version numbers generated by pkgver() follow Git tags
and coherent with the version numbers of the aml package.

2 files changed, 3 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6db1f745eb91..ab4c8bdb809a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aml-git
 	pkgdesc = Another/Andri's Main Loop
-	pkgver = r103.972e0c0
+	pkgver = 0.2.0
 	pkgrel = 1
 	url = https://github.com/any1/aml
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 767184d55c0c..1bb21f6e01f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adrian Perez de Castro <aperez@igalia.com>
 pkgname=aml-git
 pkgdesc="Another/Andri's Main Loop"
-pkgver=r103.972e0c0
+pkgver=0.2.0
 pkgrel=1
 url=https://github.com/any1/aml
 arch=(x86_64)
@@ -14,12 +14,7 @@ source=("${pkgname}::git+${url}")
 sha256sums=(SKIP)
 
 pkgver () {
-	cd "${pkgname}"
-	(
-		set -o pipefail
-		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-	)
+	git -C "$pkgname" describe --tags --abbrev=10 | sed 's/^v//; s/-/+/; s/-/./'
 }
 
 build () {