commit vimpager-git 2.06.r89.g0007949-1

2 files changed, 15 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf1d49008187..3b0db42661d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
+# Generated by mksrcinfo v8
+# Tue Feb 23 08:55:36 UTC 2016
 pkgbase = vimpager-git
 	pkgdesc = A vim-based script to use as a PAGER - git checkout
-	pkgver = 1.8.3.r0.gaf707ef
+	pkgver = 2.06.r89.g0007949
 	pkgrel = 1
 	url = https://github.com/rkitover/vimpager
 	arch = any
 	license = custom:vim
+	makedepends = pandoc
 	depends = vim
 	provides = vimpager
 	conflicts = vimpager
diff --git a/PKGBUILD b/PKGBUILD
index bb563792156a..d668f7fca806 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=vimpager-git
-pkgver=1.8.3.r0.gaf707ef
+pkgver=2.06.r89.g0007949
 pkgrel=1
 pkgdesc='A vim-based script to use as a PAGER - git checkout'
 arch=('any')
 url='https://github.com/rkitover/vimpager'
 license=('custom:vim')
 depends=('vim')
+makedepends=('pandoc')
 conflicts=('vimpager')
 provides=('vimpager')
 backup=('etc/vimpagerrc')
@@ -21,9 +22,14 @@ pkgver() {
 	cd vimpager/
 
 	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+		printf '%s.r%s.g%s' \
+			"$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
+			"$(git rev-list --count ${GITTAG}..)" \
+			"$(git log -1 --format='%h')"
 	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+		printf '0.r%s.g%s' \
+			"$(git rev-list --count master)" \
+			"$(git log -1 --format='%h')"
 	fi
 }
 
@@ -32,6 +38,7 @@ package() {
 
 	make PREFIX="/usr" SYSCONFDIR="/etc" DESTDIR="${pkgdir}" install
 
-	ln -s "/usr/share/licenses/vim/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+	install -d "${pkgdir}/usr/share/licenses/${pkgname%-git}/"
+	ln -s "/usr/share/licenses/vim/license.txt" "${pkgdir}/usr/share/licenses/${pkgname%-git}/license.txt"
 }