pkgver rewrite

2 files changed, 4 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff1d4fe1bb55..37c4bb2e2ddc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = texinfo-git
 	pkgdesc = GNU documentation system for on-line information and printed output
-	pkgver = r8432.34b30bd643
+	pkgver = 6.6r11.g2ae3ae3e5a
 	pkgrel = 1
 	url = http://www.gnu.org/software/texinfo/
 	arch = i686
@@ -15,7 +15,6 @@ pkgbase = texinfo-git
 	provides = texinfo-js
 	conflicts = texinfo
 	conflicts = texinfo-js
-	options = !makeflags
 	options = libtool
 	source = texinfo-git::git://git.savannah.gnu.org/texinfo.git
 	source = texinfo-install.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/texinfo-install.hook?h=packages/texinfo
diff --git a/PKGBUILD b/PKGBUILD
index cf6f3f0c58a4..20aa6ce8c482 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=texinfo-git
-pkgver=r8432.34b30bd643
+pkgver=6.6r11.g2ae3ae3e5a
 pkgrel=1
 pkgdesc="GNU documentation system for on-line information and printed output"
 arch=('i686' 'x86_64')
@@ -18,11 +18,11 @@ source=("$pkgname::git://git.savannah.gnu.org/texinfo.git"
 sha256sums=('SKIP'
             '66ab7eab5ecdd7757081a743f94e6f4d2e783b61db5024344450748bf1bf8eb9'
             '7300f03ac56e32564fb508b0dd07839d2428a422dcf13fd3246863f7ccb1965e')
-options=('!makeflags' 'libtool')
+options=('libtool')
 
 pkgver() {
   cd $pkgname
-  printf "r%s.%s" $(git rev-list --count HEAD) $(git describe --always)
+  git describe --tags | cut -c9- | sed 's+-+r+'|tr - .
 }
 
 build() {