Fixed the $pkgver by using upstream's release version strings and the VCS packaging guidelines.

2 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d75b7f53ac54..0dcf0a9084af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = php-cairo-git
 	pkgdesc = PHP Object Oriented interface to Cairo Graphics library.
-	pkgver = r205.9662114
-	pkgrel = 2
+	pkgver = 1.0.0_dev.r9.9662114
+	pkgrel = 1
 	url = https://github.com/gtkforphp/cairo
 	arch = any
 	license = PHP
@@ -9,7 +9,7 @@ pkgbase = php-cairo-git
 	depends = php
 	depends = cairo
 	depends = php-datastructures
-	provides = php-cairo=r205.9662114
+	provides = php-cairo=1.0.0_dev.r9.9662114
 	conflicts = php-cairo
 	source = php-cairo::git+https://github.com/gtkforphp/cairo.git#branch=php7
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 77b2458c151f..04a1b0a92498 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 pkgname="php-cairo-git"
 _pkgname=${pkgname%-git}
 __pkgname=${_pkgname#php-}
-pkgver=r205.9662114
-pkgrel=2
+pkgver=1.0.0_dev.r9.9662114
+pkgrel=1
 pkgdesc="PHP Object Oriented interface to Cairo Graphics library."
 arch=('any')
 url="https://github.com/gtkforphp/$__pkgname"
@@ -20,8 +20,10 @@ pkgver() {
   cd "$_pkgname"
   (
     set -o pipefail
-    git describe --long --tag | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    release="$(grep VERSION src/php_cairo.h | cut -f2 -d\" | tr - _)"
+    hash="$(git blame src/php_cairo.h | grep VERSION | cut -f1 -d\ )"
+    revision="$(git rev-list --count $hash..HEAD).$(git rev-parse --short HEAD)"
+    printf "%s.r%s" "$release" "$revision"
   )
 }