Upstream uses git tags now, fix pkgver()

2 files changed, 5 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29f0ee15781b..d3047160726d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cxxtools-git
 	pkgdesc = A collection of general-purpose C++ classes
-	pkgver = 2.2.2.97e42ae
-	pkgrel = 2
+	pkgver = V2.3rc1.r4.ge0ddfff
+	pkgrel = 1
 	url = http://www.tntnet.org/cxxtools.html
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 864dabdb66c6..0f239e2d664f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jonas Platte <aur@jonasplatte.de>
 
 pkgname=cxxtools-git
-pkgver=2.2.2.97e42ae
-pkgrel=2
+pkgver=V2.3rc1.r4.ge0ddfff
+pkgrel=1
 pkgdesc="A collection of general-purpose C++ classes"
 arch=('i686' 'x86_64')
 url="http://www.tntnet.org/cxxtools.html"
@@ -14,11 +14,9 @@ conflicts=('cxxtools')
 source=("$pkgname::git+https://github.com/maekitalo/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
-# This will very likely break if cxxtools starts using tags. That is intentional,
-# as the --always will be removed then anyway, requiring an update
 pkgver() {
   cd "$pkgname"
-  echo "2.2.2.$(git describe --always)"
+  git describe --long | sed 's/-/.r/;s/-/./'
 }
 
 build() {