Fix pgkver() as suggested by MarsSeed

2 files changed, 14 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4118969f88c..1d998d69dcdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,6 +2,7 @@ pkgbase = zyre-git
 	pkgdesc = Zyre - an open-source framework for proximity-based peer-to-peer applications (ZeroMQ)
 	pkgver = 20161108
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/zeromq/zyre
 	arch = i686
 	arch = x86_64
@@ -14,10 +15,9 @@ pkgbase = zyre-git
 	makedepends = make
 	makedepends = pkg-config
 	depends = czmq-git
-	provides = zyre
+	provides = zyre=20161108
 	conflicts = zyre
 	source = git+https://github.com/zeromq/zyre
 	sha256sums = SKIP
 
 pkgname = zyre-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 95701e945c30..b8465b4a12e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,10 +13,21 @@ source=(git+https://github.com/zeromq/zyre)
 sha256sums=('SKIP')
 provides=(zyre)
 conflicts=(zyre)
+epoch=1
+provides=("zyre=$pkgver")
 
 pkgver() {
   cd ${pkgname%-git}
-  git log -1 --format="%cd" --date=short | sed "s|-||g"
+
+  # Generate git tag based version. Count only proper (v)#.#* [#=number] tags.
+  local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]')
+
+  # Format git-based version for pkgver
+  # Expected format: e.g. 1.5.0rc2.r521.g99982a1c
+  echo "${_gitversion}" | sed \
+      -e 's|^\([0-9][0-9.]*\)-\([a-zA-Z]\+\)|\1\2|' \
+      -e 's|\([0-9]\+-g\)|r\1|' \
+      -e 's|-|.|g'
 }
 
 build() {