switch back to hard dependency on jre8

3 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a8944760f8a..940aec3e06ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = bwsyncandshare
 	pkgdesc = file sync and share client
 	pkgver = 10.6.447
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bwsyncandshare.kit.edu
 	arch = any
 	license = custom
-	depends = java-runtime
+	depends = jre
 	depends = gtk2
 	noextract = bwSyncAndShare_Latest_Linux.tar.gz
 	source = https://download.bwsyncandshare.kit.edu/clients/bwSyncAndShare_Latest_Linux.tar.gz
 	source = bwsyncandshare-10.6.447.patch
 	sha256sums = 9b3c876f494ceffd4a33b877200ae5c884e8ba72d56fe6a21ffa8733537092d0
-	sha256sums = 0d86a522fe6891f22ad07a2f470fed7b2a690d41dad62d085cb9f1b9135af98e
+	sha256sums = c32fc5ee12e6640596f179420ed3c7dce656a78ee49420aa7c49b371b54172f6
 
 pkgname = bwsyncandshare
 
diff --git a/PKGBUILD b/PKGBUILD
index 081f5ab96751..df3593ec9562 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,15 @@
 # Maintainer: wilga <wilga at cat3 dot de>
 pkgname=bwsyncandshare
 pkgver=10.6.447
-pkgrel=1
+pkgrel=2
 pkgdesc="file sync and share client"
 arch=('any')
 url="https://bwsyncandshare.kit.edu"
 license=('custom')
 
-# the upstream package includes a bundled Oracle jre8 but we remove it
-# and list java-runtime a dependency instead
+# the upstream package includes a bundled Oracle jre8 but we install it as a dependency instead
 # NOTE: current version seems to require oracle jre and does NOT run with openjdk
-depends=('java-runtime' 'gtk2')
+depends=('jre' 'gtk2')
 
 # need to download "Latest" version since no version-numbered tarball exists
 # this will break when a new version is published
@@ -20,7 +19,8 @@ source=("https://download.bwsyncandshare.kit.edu/clients/$_tarball"
 noextract=("$_tarball")
 
 sha256sums=('9b3c876f494ceffd4a33b877200ae5c884e8ba72d56fe6a21ffa8733537092d0'
-            '0d86a522fe6891f22ad07a2f470fed7b2a690d41dad62d085cb9f1b9135af98e')
+            'c32fc5ee12e6640596f179420ed3c7dce656a78ee49420aa7c49b371b54172f6')
+
 
 prepare() {
         tar xvzf $_tarball --exclude="bwSyncAndShare/jre"   # remove bundled Oracle jre
diff --git a/bwsyncandshare-10.6.447.patch b/bwsyncandshare-10.6.447.patch
index 88bd114f04b1..a3eb9950f219 100644
--- a/bwsyncandshare-10.6.447.patch
+++ b/bwsyncandshare-10.6.447.patch
@@ -1,6 +1,6 @@
 diff -aur bwSyncAndShare.pristine/bwSyncAndShare-Client.sh bwSyncAndShare/bwSyncAndShare-Client.sh
 --- bwSyncAndShare.pristine/bwSyncAndShare-Client.sh	2016-08-19 13:34:09.000000000 +0200
-+++ bwSyncAndShare/bwSyncAndShare-Client.sh	2016-11-01 18:24:39.184803958 +0100
++++ bwSyncAndShare/bwSyncAndShare-Client.sh	2016-11-07 09:54:25.193392689 +0100
 @@ -8,7 +8,7 @@
  # CLIENT_INSTALL needs to point to the directory
  # where the .jar file is located.
@@ -15,7 +15,7 @@ diff -aur bwSyncAndShare.pristine/bwSyncAndShare-Client.sh bwSyncAndShare/bwSync
  # Set command line to invoke program start
  #
 -RUN_CMD="$CLIENT_INSTALL/jre/bin/java $JAVA_MEM -Duser.home=$CLIENT_HOME -cp $CP de.dal33t.Start"
-+RUN_CMD="/usr/bin/java $JAVA_MEM -Duser.home=$CLIENT_HOME -cp $CP de.dal33t.Start"
++RUN_CMD="/usr/lib/jvm/java-8-jre/jre/bin/java $JAVA_MEM -Duser.home=$CLIENT_HOME -cp $CP de.dal33t.Start"
  
  #
  # Silent mode