updated to version 1.4.48V0

3 files changed, 11 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f7a5a135aee..dd719e4d358d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = xmage
 	pkgdesc = Java-based program for playing Magic:The Gathering, including client and server
-	pkgver = 1.4.47V1
-	pkgrel = 2
+	pkgver = 1.4.48V0
+	pkgrel = 0
 	url = http://xmage.de
 	install = xmage.install
 	arch = any
 	license = MIT
 	makedepends = detox
 	depends = jre8-openjdk
-	depends = java8-openjfx
 	optdepends = wmname: change window manager name for compatibility with certain WMs
-	source = http://xmage.de/files/xmage_1.4.47V1.zip
+	source = http://xmage.de/files/xmage_1.4.48V0.zip
 	source = https://raw.githubusercontent.com/magefree/mage/master/LICENSE.txt
 	source = https://raw.githubusercontent.com/magefree/Launcher/master/src/main/resources/icon-mage.png
-	sha256sums = eb87a9e8a632d3691f6c7401d99bffd44f52d572b1434e07546ddbb35991c7bb
+	sha256sums = 6984d4ebc29a51bf004ed765a05d340e4f533500de67b08d9b87114f0c44683e
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index b881b061f82d..50109ced2f99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,11 @@
 # Feedback is appreciated
 
 pkgname=xmage
-pkgver=1.4.47V1
-pkgrel=2
+pkgver=1.4.48V0
+pkgrel=0
 
 pkgdesc="Java-based program for playing Magic:The Gathering, including client and server"
 
-depends=(
-	'jre8-openjdk'
-	'java8-openjfx'
-)
-
 arch=('any')
 url="http://xmage.de"
 license=('MIT')
@@ -21,10 +16,11 @@ source=("http://xmage.de/files/xmage_${pkgver}.zip"
 	'https://raw.githubusercontent.com/magefree/mage/master/LICENSE.txt'
 	'https://raw.githubusercontent.com/magefree/Launcher/master/src/main/resources/icon-mage.png')
 
-sha256sums=("eb87a9e8a632d3691f6c7401d99bffd44f52d572b1434e07546ddbb35991c7bb" 
+sha256sums=("6984d4ebc29a51bf004ed765a05d340e4f533500de67b08d9b87114f0c44683e" 
 	"SKIP"
 	"SKIP")
 
+depends=('jre8-openjdk')
 makedepends=('detox')
 optdepends=('wmname: change window manager name for compatibility with certain WMs')
 install="${pkgname}.install"
@@ -48,10 +44,6 @@ package() {
 	sed -i '2i cd /usr/share/xmage/mage-client' mage-client/startClient-unix.sh
 	sed -i '2i cd /usr/share/xmage/mage-server' mage-server/startServer-unix.sh
 
-	msg2 "specifying location of OpenJDK 8"
-	sed -i "s|java|/usr/lib/jvm/java-8-openjdk/bin/java|g" mage-client/startClient-unix.sh
-	sed -i "s|java|/usr/lib/jvm/java-8-openjdk/bin/java|g" mage-server/startServer-unix.sh
-
 	msg2 "increasing default memory limit of client and server"
 	sed -i 's|-Xmx512m|-Xmx2048m|g' mage-client/startClient-unix.sh
 	sed -i 's|-Xmx512m|-Xmx2048m|g' mage-server/startServer-unix.sh
@@ -82,4 +74,3 @@ package() {
 	mkdir -p "${pkgdir}"/usr/share/applications
 	install -m755 ../xmage.desktop "${pkgdir}"/usr/share/applications/xmage.desktop
 }
-
diff --git a/PKGBUILD-jre-8u201-x86_64 b/PKGBUILD-jre-8u201-x86_64
index a99eb84c7036..631ecbd4c941 100644
--- a/PKGBUILD-jre-8u201-x86_64
+++ b/PKGBUILD-jre-8u201-x86_64
@@ -2,8 +2,8 @@
 # Feedback is appreciated
 
 pkgname=xmage
-pkgver=1.4.47V1
-pkgrel=2
+pkgver=1.4.48V0
+pkgrel=0
 _java_version=8u201
 _java_dir=jre1.8.0_201
 
@@ -19,7 +19,7 @@ source=("http://xmage.de/files/xmage_${pkgver}.zip"
 	'https://raw.githubusercontent.com/magefree/Launcher/master/src/main/resources/icon-mage.png'
 	'http://xmage.today/java/jre-8u201-linux-x64.tar.gz'
 )
-sha256sums=("eb87a9e8a632d3691f6c7401d99bffd44f52d572b1434e07546ddbb35991c7bb" 
+sha256sums=("6984d4ebc29a51bf004ed765a05d340e4f533500de67b08d9b87114f0c44683e" 
 	"SKIP"
 	"SKIP"
 	'12c745fbb8735bf450b8c6ba6f649bebe19915f05742975e443bdc8566170352'