include commit into pkgver, remove patch

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 184d1a0114bc..603b2954d1c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = texinfo-git
 	pkgdesc = GNU documentation system for on-line information and printed output
-	pkgver = 6.7.r9221
+	pkgver = 6.8.r10106.5605c12a99
 	pkgrel = 1
 	epoch = 1
 	url = http://www.gnu.org/software/texinfo/
@@ -27,4 +27,3 @@ pkgbase = texinfo-git
 	sha256sums = 7300f03ac56e32564fb508b0dd07839d2428a422dcf13fd3246863f7ccb1965e
 
 pkgname = texinfo-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a9a87a9936bb..852630fdbcd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=texinfo-git
-pkgver=6.7.r9221
+pkgver=6.8.r10106.5605c12a99
 pkgrel=1
 epoch=1
 pkgdesc="GNU documentation system for on-line information and printed output"
@@ -24,8 +24,8 @@ options=('libtool')
 
 pkgver() {
   cd $pkgname
-  printf "%s.r%s" \
-    $(awk -F\[ '/AC_INIT/ {print $3}' configure.ac |cut -c 1-3) $(git rev-list --count HEAD)
+  printf "%s.r%s.%s" \
+    $(awk -F\[ '/AC_INIT/ {print $3}' configure.ac |cut -c 1-3) $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
 }
 
 prepare() {
@@ -38,7 +38,6 @@ prepare() {
 build() {
   cd $pkgname
   ./autogen.sh || true
-#  sed -i '5904,5914d' configure
   ./configure --prefix=/usr --libexecdir=/usr/lib
   make
 }