better pkgver function, epoch bump

2 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe6e6de3e2ac..95f7e99d99c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = sword-svn
 	pkgdesc = Libraries for Bible programs - svn-version
-	pkgver = r3851
+	pkgver = 1.9.0.svnversion.3852
 	pkgrel = 1
-	epoch = 1
+	epoch = 2
 	url = http://www.crosswire.org/sword/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 57f503750c08..edecdc56c8d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=sword-svn
-pkgver=r3851
+pkgver=1.9.0.svnversion.3852
 pkgrel=1
-epoch=1
+epoch=2
 pkgdesc="Libraries for Bible programs - svn-version"
 arch=('i686' 'x86_64')
 url="http://www.crosswire.org/sword/"
@@ -18,7 +18,7 @@ sha256sums=('SKIP')
 pkgver() {
   cd "${pkgname%-svn}"
   local ver="$(svnversion)"
-  printf "r%s" "${ver//[[:alpha:]]}"
+  printf "%s.%s" $(awk '/AC_INIT/ {print $2}' configure.ac | tr -d ,) "${ver//[[:alpha:]]}"
 }
 
 build() {