summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Born2017-05-31 21:12:12 +0200
committerAndreas Born2017-05-31 21:12:12 +0200
commite7485d4986993f0c261eaf6219962873d83eec05 (patch)
treeb1395fb7e508d0b96453c6730d193c6193340589
parent8c03ddd04626f18fef2995d6d3a10315ee478601 (diff)
downloadaur-e7485d4986993f0c261eaf6219962873d83eec05.tar.gz
Revert back to requiring Oracle JRE
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 42f2bd730be7..7f4107c80161 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,8 @@ pkgbase = lrz-syncshare
license = custom
depends = desktop-file-utils
depends = hicolor-icon-theme
- depends = java-runtime=8
+ depends = jre>8u
+ depends = jre<9
depends = xdg-utils
source = https://syncandshare.lrz.de/client_deployment/LRZ_Sync_Share_Latest_Linux.tar.gz
md5sums = b3a451629b5779822264394849046385
diff --git a/PKGBUILD b/PKGBUILD
index 9a85e44eb3f1..6e251b5a3e5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgdesc="Sync client for the LRZ Sync+Share service"
url='https://syncandshare.lrz.de/'
arch=('any')
license=('custom')
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'java-runtime=8' 'xdg-utils')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'jre>8u' 'jre<9' 'xdg-utils')
source=("https://syncandshare.lrz.de/client_deployment/LRZ_Sync_Share_Latest_Linux.tar.gz")
md5sums=('b3a451629b5779822264394849046385')
@@ -18,9 +18,8 @@ pkgver() {
prepare() {
cd "${srcdir}/LRZ_Sync_Share"
- # seems to work now with openjdk and not just Oracle's JRE
- # -e 's;^RUN_CMD="$CLIENT_INSTALL/jre/bin/java ;RUN_CMD="/usr/lib/jvm/java-8-jre/jre/bin/java ;' \
sed -e "s;^CLIENT_INSTALL=.*\$;CLIENT_INSTALL=/usr/share/${pkgname};" \
+ -e 's;^RUN_CMD="$CLIENT_INSTALL/jre/bin/java ;RUN_CMD="/usr/lib/jvm/java-8-jre/jre/bin/java ;' \
-i LRZ_Sync_Share-Client.sh
sed -e "s;^Icon=.*;Icon=${pkgname};" \
-e "s;^Exec=.*;Exec=${pkgname};" -i install-files/LRZ_Sync_Share.desktop