5 files changed, 30 insertions, 29 deletions
diff --git a/multimedia/MediathekView/MediathekView.SlackBuild b/multimedia/MediathekView/MediathekView.SlackBuild
index 2eea232951..b349f89a3f 100644
--- a/multimedia/MediathekView/MediathekView.SlackBuild
+++ b/multimedia/MediathekView/MediathekView.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for MediathekView
 
-# Copyright 2013-2015 Heiko Rosemann, Germany
+# Copyright 2013-2020 Heiko Rosemann, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,26 +23,33 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=MediathekView
-VERSION=${VERSION:-13.2.1}
+VERSION=${VERSION:-13.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=noarch
+ARCH=${ARCH:-$(uname -m)}
+
+SRCNAM=${PRGNAM}-${VERSION}-linux
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ ! "${ARCH}" = "x86_64" ] ; then
+  echo "Architecture ${ARCH} is not supported."
+  exit 1
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvzf $CWD/${PRGNAM}-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+tar xvzf $CWD/${SRCNAM}.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -50,16 +57,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/share/$PRGNAM/bin
-cp -a bin/flv-linux.sh $PKG/usr/share/$PRGNAM/bin/flv.sh
-cp -a lib/ $PKG/usr/share/$PRGNAM
-cp -a MediathekView.jar $PKG/usr/share/$PRGNAM
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a MediathekView MediathekView.ico MediathekView.jar MediathekView.svg \
+	MediathekView.vmoptions .install4j/ bin/ jre/ \
+	$PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/bin
-cat $CWD/$PRGNAM.wrapper > $PKG/usr/bin/$PRGNAM
-chmod 0755 $PKG/usr/bin/$PRGNAM
+ln -s /usr/share/$PRGNAM/MediathekView $PKG/usr/bin/MediathekView
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/MediathekView/MediathekView.info b/multimedia/MediathekView/MediathekView.info
index 64fd26bd0c..d6103ec856 100644
--- a/multimedia/MediathekView/MediathekView.info
+++ b/multimedia/MediathekView/MediathekView.info
@@ -1,10 +1,10 @@
 PRGNAM="MediathekView"
-VERSION="13.2.1"
+VERSION="13.6.0"
 HOMEPAGE="http://www.mediathekview.de"
-DOWNLOAD="https://download.mediathekview.de/stabil/MediathekView-13.2.1.tar.gz"
-MD5SUM="88449174dce08d94876184a7b021fd63"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.mediathekview.de/stabil/MediathekView-13.6.0-linux.tar.gz"
+MD5SUM_x86_64="d334a24c4b61fa156238aaa49ec105dc"
+REQUIRES=""
 MAINTAINER="Heiko Rosemann"
 EMAIL="heiko.rosemann@web.de"
diff --git a/multimedia/MediathekView/MediathekView.wrapper b/multimedia/MediathekView/MediathekView.wrapper
deleted file mode 100644
index db5ab145f8..0000000000
--- a/multimedia/MediathekView/MediathekView.wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /usr/share/MediathekView
-exec java -jar MediathekView.jar $*
-cd $OLDPWD
diff --git a/multimedia/MediathekView/README b/multimedia/MediathekView/README
index 7d216a4b23..0d9f5b6de5 100644
--- a/multimedia/MediathekView/README
+++ b/multimedia/MediathekView/README
@@ -7,6 +7,4 @@ public TV's online databases for shows.
 These shows can be streamed or saved locally using a user-
 configurable program.
 
-This version of MediathekView requires JavaFX - if you are using the jdk from
-Oracle (SBo-package jdk) you are fine, they provide JavaFX, but if you use
-openjdk, you need both openjdk and openjfx.
+This version of MediathekView includes the JRE it requires to run.
diff --git a/multimedia/MediathekView/slack-desc b/multimedia/MediathekView/slack-desc
index 7980d70910..1edc007eab 100644
--- a/multimedia/MediathekView/slack-desc
+++ b/multimedia/MediathekView/slack-desc
@@ -12,8 +12,8 @@ MediathekView: MediathekView is a program to search the German/Swiss/Austrian
 MediathekView: public TV's online databases for shows.
 MediathekView: (ARD, ZDF, Arte, 3Sat, SWR, BR, MDR, NDR, WDR, HR, RBB, ORF and SF)
 MediathekView:
-MediathekView: This version of MediathekView requires JavaFX - if you are using the
-MediathekView: jdk from Oracle (SBo-package jdk) you are fine, they provide JavaFX,
-MediathekView: but if you use openjdk, you need both openjdk and openjfx.
+MediathekView: This version of MediathekView includes the JRE it requires to run.
+MediathekView:
+MediathekView:
 MediathekView:
 MediathekView: