update to version 13.5.0 (second try)

Thanks Rainer Suhm for the patch!

4 files changed, 21 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1ed3d96d017..3f9e52f7f633 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mediathek
 	pkgdesc = Access the Mediathek of many German TV stations
-	pkgver = 13.3.0
-	pkgrel = 1
+	pkgver = 13.5.0
+	pkgrel = 2
 	url = https://mediathekview.de
 	arch = any
 	license = GPL3
@@ -9,11 +9,11 @@ pkgbase = mediathek
 	optdepends = mplayer: record streams
 	optdepends = flvstreamer: stream flash
 	optdepends = vlc: play files directly from mediathek
-	source = https://download.mediathekview.de/stabil/MediathekView-13.3.0-linux.tar.gz
-	source = mediathek
+	source = https://download.mediathekview.de/stabil/MediathekView-13.5.0-linux.tar.gz
+	source = mediathekview.sh
 	source = mediathek.desktop
-	sha512sums = 76455f4217c9a285455d86d79cc03afb11951060f9dbb1d1e3a29cce415de09e96963f1a637b26b157474b968741a68f5cb95f542916c791af64871d4ad6b62d
-	sha512sums = 184ee2cd71a85d283b3f3866e652afdef9f6155ddba11e2a7de0dc7fda95f9bc3846dc7adfce6b3680da3daf75be475d746b828753ca8590e49b699006def0ee
+	sha512sums = 2f4bc1c97c44830b367dbea6d2d61415b3833f5b9c759b8d863735d81201e8025f348d9103d56c703d1909caef8a8fdce9296abef2f6645c039afe713f60c2e1
+	sha512sums = 7607dc784bbe98e729a3f5f3482cd36524cf607c0377b2f178b713a6ddf1ef900b9c414c6211c318ddf61e6e4431c359968678d2b01a3331ea24988655aab74c
 	sha512sums = 1a5728920704d98d7ae08d25c06c45b3dbac46ece2dc660e3a2b5806cff29263e9734cd7993d02c4c1f7710d37395da29abc094e3d786a0eaf6d130b02fcad48
 
 pkgname = mediathek
diff --git a/PKGBUILD b/PKGBUILD
index cb2e954e3a69..3668658a7888 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Steffen Weber <-boenki-gmx-de->
 # Maintainer: Stephan Springer <buzo+arch@Lini.de>
+# Contributor: Rainer Suhm <automat at posteo dot de>
 # Contributor: Soeren Koerner <nonick at posteo dot de>
 # Contributor: Benedikt 'linopolus' Mueller <benemue at googlemail dot com>
 
 pkgname=mediathek
 _realname=MediathekView
-pkgver=13.3.0
-pkgrel=1
+pkgver=13.5.0
+pkgrel=2
 pkgdesc="Access the Mediathek of many German TV stations"
 arch=('any')
 url="https://mediathekview.de"
@@ -16,19 +17,18 @@ optdepends=('mplayer: record streams'
             'flvstreamer: stream flash'
             'vlc: play files directly from mediathek')
 source=(https://download.mediathekview.de/stabil/$_realname-$pkgver-linux.tar.gz
-        $pkgname
+        mediathekview.sh
         $pkgname.desktop)
 
 # curl https://download.mediathekview.de/stabil/MediathekView-latest.tar.gz.SHA-512
-sha512sums=('76455f4217c9a285455d86d79cc03afb11951060f9dbb1d1e3a29cce415de09e96963f1a637b26b157474b968741a68f5cb95f542916c791af64871d4ad6b62d'
-            '184ee2cd71a85d283b3f3866e652afdef9f6155ddba11e2a7de0dc7fda95f9bc3846dc7adfce6b3680da3daf75be475d746b828753ca8590e49b699006def0ee'
+sha512sums=('2f4bc1c97c44830b367dbea6d2d61415b3833f5b9c759b8d863735d81201e8025f348d9103d56c703d1909caef8a8fdce9296abef2f6645c039afe713f60c2e1'
+            '7607dc784bbe98e729a3f5f3482cd36524cf607c0377b2f178b713a6ddf1ef900b9c414c6211c318ddf61e6e4431c359968678d2b01a3331ea24988655aab74c'
             '1a5728920704d98d7ae08d25c06c45b3dbac46ece2dc660e3a2b5806cff29263e9734cd7993d02c4c1f7710d37395da29abc094e3d786a0eaf6d130b02fcad48')
 
 package() {
-    install -d "$pkgdir"/{opt/$pkgname/bin,usr/{bin,share/{applications,pixmaps}}}
-    install -m755 $pkgname "$pkgdir"/usr/bin/
-    install -m644 $_realname.jar "$pkgdir"/opt/$pkgname/
-    install -m755 bin/flv.sh "$pkgdir"/opt/$pkgname/bin/
-    install -m644 $pkgname.desktop "$pkgdir"/usr/share/applications/
-    install -m644 $_realname.svg "$pkgdir"/usr/share/pixmaps/
+    install -d "$pkgdir"/{opt/"$pkgname",usr/{bin,share/{applications,pixmaps}}}
+    install -m755 mediathekview.sh "$pkgdir/usr/bin/$pkgname"
+    install -m644 "$_realname/$_realname.jar" "$pkgdir/opt/$pkgname/"
+    install -m644 "$pkgname".desktop "$pkgdir"/usr/share/applications/
+    install -m644 "$_realname/$_realname.svg" "$pkgdir"/usr/share/pixmaps/
 }
diff --git a/mediathek b/mediathek
deleted file mode 100644
index 5eea918ad67c..000000000000
--- a/mediathek
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-if [ -d "/usr/lib/jvm/java-11-openjdk/bin" ]; then
-    export PATH=/usr/lib/jvm/java-11-openjdk/bin:$PATH
-fi
-cd /opt/mediathek
-java -jar MediathekView.jar "$@"
diff --git a/mediathekview.sh b/mediathekview.sh
new file mode 100644
index 000000000000..5af190e1ecda
--- /dev/null
+++ b/mediathekview.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+JAVAPATH="/usr/lib/jvm/java-11-openjdk/bin"
+[ -d "$JAVAPATH" ] && export PATH="$JAVAPATH":$PATH
+exec java -Xmx1G -jar /opt/mediathek/MediathekView.jar "$@"