Change pkgver() function

1 files changed, 9 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cedad5583a61..8a79af98ab9d 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ivan Zenin <i.zenin@gmx.com>
 
-pkgname="wxbase-git"
-pkgver=head
+pkgname=wxbase-git
+pkgver=latest
 pkgrel=3
 pkgdesc="wxWidgets base libraries for no X install (3.0 branch development version)" 
 arch=('i686' 'x86_64')
@@ -14,12 +14,15 @@ source=("git+git://github.com/wxWidgets/wxWidgets.git")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "${SRCDEST}/wxWidgets"
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  cd "${srcdir}"/wxWidgets
+  ( set -o pipefail
+    git describe --long 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)"
+  )
 }
 
 build() {
-  cd "${srcdir}/wxWidgets"
+  cd "${srcdir}"/wxWidgets
   git checkout WX_3_0_BRANCH
   ./configure \
  	  --prefix=/usr \
@@ -32,7 +35,7 @@ build() {
 } 
 
 package() {
-  cd "${srcdir}/wxWidgets"
+  cd "${srcdir}"/wxWidgets
   make DESTDIR="${pkgdir}" install
   find "${pkgdir}" -type d -name .git -exec rm -r '{}' +
   install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/wxWidgets/LICENSE"