Use a proper version format.

3 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a7110aa1e6c..40b915fd2244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = unvanquished-git
 	pkgdesc = A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Git version.
-	pkgver = v0.51.1.108.g33ba53888
+	pkgver = 0.51.1.r108.g33ba53888
 	pkgrel = 1
 	url = https://www.unvanquished.net
 	install = unvanquished.install
@@ -41,12 +41,12 @@ pkgbase = unvanquished-git
 	backup = etc/conf.d/unvanquished.conf
 	backup = etc/unvanquished/server.cfg
 	backup = etc/unvanquished/maprotation.cfg
-	source = unvanquished.install
-	source = unvanquished-git::git+https://github.com/Unvanquished/Unvanquished.git#branch=master
+	source = git+https://github.com/Unvanquished/Unvanquished.git#branch=master
 	source = naclsdk_linux64-4.tar.bz2::https://dl.unvanquished.net/deps/linux64-4.tar.bz2
-	md5sums = 6d9430b5b06b93a43a1cb79e14637f0b
+	source = unvanquished.install
 	md5sums = SKIP
 	md5sums = 2ba12c71625919ddc282172b74fa4887
+	md5sums = 6d9430b5b06b93a43a1cb79e14637f0b
 
 pkgname = unvanquished-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..238d8cceaec0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/pkg
+/src
+/Unvanquished
+/naclsdk_*.tar.bz2
+/*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index cd0248372299..5fd4c0240ea5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Martin F. Schumann
 
 pkgname=unvanquished-git
-pkgver=v0.51.1.108.g33ba53888
+pkgver=0.51.1.r108.g33ba53888
 pkgrel=1
 pkgdesc='A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Git version.'
 arch=('x86_64')
@@ -31,25 +31,23 @@ _type='branch'
 _checkout='master'
 
 # set this to share more text with the non-git version
-_unvdir="${pkgname}"
+_unvdir="Unvanquished"
 
 # NaCL SDK is a buildtime dependency of Dæmon.
 # Note that due to enormous compile times, we use a binary distribution.
 _naclsdkbasever="4"
 _naclsdkver="linux64-${_naclsdkbasever}"
 
-source=('unvanquished.install'
-        "${_unvdir}::git+https://github.com/Unvanquished/Unvanquished.git#${_type}=${_checkout}"
-        "naclsdk_${_naclsdkver}.tar.bz2::https://dl.unvanquished.net/deps/${_naclsdkver}.tar.bz2")
-
-md5sums=('6d9430b5b06b93a43a1cb79e14637f0b'
-         'SKIP'
-         '2ba12c71625919ddc282172b74fa4887')
+source=("git+https://github.com/Unvanquished/Unvanquished.git#${_type}=${_checkout}"
+        "naclsdk_${_naclsdkver}.tar.bz2::https://dl.unvanquished.net/deps/${_naclsdkver}.tar.bz2"
+        'unvanquished.install')
+md5sums=('SKIP'
+         '2ba12c71625919ddc282172b74fa4887'
+         '6d9430b5b06b93a43a1cb79e14637f0b')
 
 pkgver() {
 	cd "${srcdir}/${_unvdir}"
-	local ver="$(git describe --long --match "v*")"
-	printf "%s" "${ver//-/.}"
+	git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {