Improve pkgver()

1 files changed, 4 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4ef724969fd8..f3558ed22c90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,10 @@ _gitname=ezpadova
 pkgver() {
     cd "${srcdir}/${_gitname}"
 
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    ( set -o pipefail
+      git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    )
 }
 
 prepare() {