base `pkgver` on the tags, matching `spirv-tools` in [extra]

2 files changed, 3 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be28fe79994a..8b47d371afba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = spirv-tools-git
 	pkgdesc = API and commands for processing SPIR-V modules
-	pkgver = r1864.2af6ffae826426cff344
+	pkgver = 2020.6+14.g17ffa89097
 	pkgrel = 1
 	url = https://github.com/KhronosGroup/SPIRV-Tools
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index d93202dc520f..6c392e965b70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
 
 pkgname=spirv-tools-git
-pkgver=r1864.2af6ffae826426cff344
+pkgver=2020.6+14.g17ffa89097
 pkgrel=1
 pkgdesc='API and commands for processing SPIR-V modules'
 url='https://github.com/KhronosGroup/SPIRV-Tools'
@@ -19,8 +19,7 @@ conflicts=('spirv-tools')
 provides=('spirv-tools')
 
 pkgver() {
-  cd "${srcdir}"/SPIRV-Tools
-  printf "r%d.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git -C SPIRV-Tools describe --tags --abbrev=10 | sed 's/^v//; s/-/+/; s/-/./'
 }
 
 build() {