use mazornoobs beta releases

2 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87bc439146b1..e3d2055d3cce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 # Generated by mksrcinfo v8
-# Mon Jul 10 18:49:36 UTC 2017
+# Tue Jul 11 06:43:53 UTC 2017
 pkgbase = python-fafclient
 	pkgdesc = Forged Alliance Forever - Lobby Client. Community-driven client system for Supreme Commander: Forged Alliance.
-	pkgver = 0.13.2.103.g71b7f7cd
+	pkgver = 0.15.0
 	pkgrel = 1
 	epoch = 0
 	url = http://www.faforever.com/
 	arch = any
 	license = GPL3
 	makedepends = python-setuptools
+	makedepends = git
 	depends = python-pyqt5
 	depends = python-ipaddress
 	depends = python-py
@@ -27,7 +28,7 @@ pkgbase = python-fafclient
 	depends = faf-uid
 	depends = qt5-webengine
 	replaces = python2-fafclient
-	source = git+https://github.com/FAForever/client.git#branch=develop
+	source = git+https://github.com/Wesmania/client.git
 	source = FAForeverPy36.desktop
 	sha256sums = SKIP
 	sha256sums = 4b748a04d4d37744ff7ba81101d4ac08bd26daeea06df87fc7e1b55205931eca
diff --git a/PKGBUILD b/PKGBUILD
index 28dbbb009bc3..987d3674b764 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Martin Müllenhaupt <mm+aur.archlinux.org@netlair.de>
 pkgname=python-fafclient
-pkgver=0.13.2.103.g71b7f7cd
+pkgver=0.15.0
 pkgrel=1
 epoch=0
 pkgdesc="Forged Alliance Forever - Lobby Client. Community-driven client system for Supreme Commander: Forged Alliance."
@@ -9,7 +9,7 @@ arch=('any')
 license=('GPL3')
 groups=()
 depends=('python-pyqt5' 'python-ipaddress' 'python-py' 'python-pycparser' 'python-dateutil' 'python-requests' 'python-lupa' 'python-trueskill' 'python-cffi' 'python-marshmallow-jsonapi' 'python-semantic-version' 'python-faftools' 'lib32-libpulse' 'wine>1.6.0' 'xdelta3' 'faf-uid' 'qt5-webengine')
-makedepends=('python-setuptools')
+makedepends=('python-setuptools' 'git')
 checkdepends=()
 optdepends=()
 provides=()
@@ -19,7 +19,7 @@ backup=()
 options=()
 install=
 changelog=
-source=("git+https://github.com/FAForever/client.git#branch=develop" 'FAForeverPy36.desktop')
+source=("git+https://github.com/Wesmania/client.git" 'FAForeverPy36.desktop')
 sha256sums=('SKIP'
             '4b748a04d4d37744ff7ba81101d4ac08bd26daeea06df87fc7e1b55205931eca')
 noextract=()
@@ -27,10 +27,11 @@ validpgpkeys=()
 
 pkgver() {
   cd "client"
-  git describe --tags | sed -e 's/-/./g'
+  git describe --tags --abbrev=0
 }
 prepare() {
   cd "client"
+  git checkout `git describe --tags --abbrev=0`
   mkdir -p fafclient
   mv src fafclient/src
   echo "import src" >> fafclient/__init__.py
@@ -46,5 +47,5 @@ package() {
   FAFCLIENT_VERSION=$pkgver python setup.py install --root="$pkgdir" --optimize=1 
   install -D "$srcdir/FAForeverPy36.desktop" "$pkgdir/usr/share/applications/FAForeverPy36.desktop"
   cp -r "res" "$pkgdir/usr/lib/python3.6/site-packages/fafclient/res"
-  echo `expr "$pkgver" : '^\([0-9]\.[0-9][0-9]\.[0-9]*\).*'` > "$pkgdir/usr/lib/python3.6/site-packages/fafclient/res/RELEASE-VERSION"
+  echo `git describe --tags --abbrev=0` > "$pkgdir/usr/lib/python3.6/site-packages/fafclient/res/RELEASE-VERSION"
 }