Use `git describe --long --tags` in pkgver()

2 files changed, 11 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 600d5e0835e5..3971bab2bec5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = wav2png-git
 	pkgdesc = Creates waveform pngs out of audio files.
-	pkgver = 103
+	pkgver = 0.4.r0.g80e277e
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/beschulz/wav2png
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 67f0826ca4eb..5d2015fb8abe 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
 # Contributor: Trizen <echo dHJpemVuQHByb3Rvbm1haWwuY29tCg== | base64 -d>
 # Contributor: dryes <joswiseman@cock.li>
 
+epoch=1
 pkgname='wav2png-git'
-pkgver=103
+_pkgname='wav2png'
+pkgver=0.4.r0.g80e277e
 pkgrel=1
 pkgdesc='Creates waveform pngs out of audio files.'
 url='https://github.com/beschulz/wav2png'
@@ -16,19 +18,19 @@ source=('git+https://github.com/beschulz/wav2png.git')
 md5sums=('SKIP')
 
 pkgver() {
-  cd "${pkgname%-git}"
-  echo $(git rev-list --count master)
+  cd "$_pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  [ -d "${srcdir}/${pkgname%-git}-build" ] && rm -rf "${srcdir}/${pkgname%-git}-build"
-  cp -r "${srcdir}/${pkgname%-git}" "${srcdir}/${pkgname%-git}-build"
+  [ -d "${srcdir}/${_pkgname}-build" ] && rm -rf "${srcdir}/${_pkgname}-build"
+  cp -r "${srcdir}/${_pkgname}" "${srcdir}/${_pkgname}-build"
 }
 
 package() {
-  cd "${srcdir}/${pkgname%-git}-build/build"
+  cd "${srcdir}/${_pkgname}-build/build"
   make all
 
   mkdir -p "${pkgdir}/usr/bin"
-  mv "${srcdir}/${pkgname%-git}-build/bin/Linux/wav2png" "${pkgdir}/usr/bin/"
+  mv "${srcdir}/${_pkgname}-build/bin/Linux/wav2png" "${pkgdir}/usr/bin/"
 }