update to 0.18.3

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17affe8be8fe..98d418ce6610 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = python-fafclient
 	pkgdesc = Forged Alliance Forever - Lobby Client. Community-driven client system for Supreme Commander: Forged Alliance.
-	pkgver = 0.18.1
-	pkgrel = 2
+	pkgver = 0.18.3
+	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-jsonschema
@@ -17,9 +16,9 @@ pkgbase = python-fafclient
 	depends = xdelta3
 	depends = faf-uid
 	depends = qt5-webengine
-	depends = qt5-multimedia
-	depends = python-jinja
-	depends = python-sip
+	depends = faf-ice-adapter-java
+	replaces = python-fafclient-icetest
+	replaces = python2-fafclient-icetest
 	replaces = python2-fafclient
 	source = git+https://github.com/FAForever/client.git#branch=stable/0.18
 	source = FAForeverPy37.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 0485f622fc11..f8207bf90505 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Martin Müllenhaupt <mm+aur.archlinux.org@netlair.de>
 pkgname=python-fafclient
-pkgver=0.18.1
-pkgrel=2
+pkgver=0.18.3
+pkgrel=1
 epoch=0
 pkgdesc="Forged Alliance Forever - Lobby Client. Community-driven client system for Supreme Commander: Forged Alliance."
 url="http://www.faforever.com/"
 arch=('any')
 license=('GPL3')
 groups=()
-depends=('python-pyqt5' 'python-ipaddress' 'python-jsonschema' 'python-semantic-version' 'lib32-libpulse' 'wine>1.6.0' 'xdelta3' 'faf-uid' 'qt5-webengine' 'qt5-multimedia' 'python-jinja' 'python-sip')
-makedepends=('python-setuptools' 'git')
+depends=('python-pyqt5' 'python-ipaddress' 'python-jsonschema' 'python-semantic-version' 'lib32-libpulse' 'wine>1.6.0' 'xdelta3' 'faf-uid' 'qt5-webengine' 'faf-ice-adapter-java')
+makedepends=('python-setuptools')
 checkdepends=()
 optdepends=()
 provides=()
-conflicts=()
-replaces=('python2-fafclient')
+conflicts=('')
+replaces=('python-fafclient-icetest' 'python2-fafclient-icetest' 'python2-fafclient')
 backup=()
 options=()
 install=
@@ -27,11 +27,11 @@ validpgpkeys=()
 
 pkgver() {
   cd "client"
-  git describe --tags --abbrev=0 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --tags | sed -e 's/-/./g'
 }
+
 prepare() {
   cd "client"
-  git checkout `git describe --tags --abbrev=0`
   mkdir -p fafclient
   mv src fafclient/src
   echo "import src" >> fafclient/__init__.py
@@ -47,5 +47,5 @@ package() {
   FAFCLIENT_VERSION=$pkgver python setup.py install --root="$pkgdir" --optimize=1 
   install -D "$srcdir/FAForeverPy37.desktop" "$pkgdir/usr/share/applications/FAForeverPy37.desktop"
   cp -r "res" "$pkgdir/usr/lib/python3.7/site-packages/fafclient/res"
-  echo `git describe --tags --abbrev=0` > "$pkgdir/usr/lib/python3.7/site-packages/fafclient/res/RELEASE-VERSION"
+  echo `expr "$pkgver" : '^\([0-9]\.[0-9][0-9]\.[0-9]*\).*'` > "$pkgdir/usr/lib/python3.7/site-packages/fafclient/res/RELEASE-VERSION"
 }