support Java 11

jre11-openjdk seems to be compatible, but it's the last.

3 files changed, 10 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77ee1ccde5e5..92fd47bb0301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = lbe
 	pkgdesc = Jarek Gawor's LDAP Browser/Editor (last freeware version)
 	pkgver = 2.8.2
-	pkgrel = 8
+	pkgrel = 9
 	url = http://web.archive.org/web/20090201080715/http://mcs.anl.gov/~gawor/ldap/
 	arch = any
 	license = custom
-	depends = java-runtime=8
-	noextract = ldapbrowser-2.8.2.zip
+	depends = java-runtime>=8
+	depends = java-runtime<=11
 	source = https://nullroute.lt/mirrors/files/ldapbrowser-2.8.2.zip
 	source = lbe.desktop
 	source = lbe.sh
 	sha256sums = 6c1a1b80b81d83f005d4a006bc070b1b8f44f90151f7af6b14004c96e26687ec
 	sha256sums = ccdc18f2879c6ab10aa0f3ad087a3aa225a6146340be7e2fb46302b961255972
-	sha256sums = 3181d3f000e6df4a1dbc86f3860964f2528450dc7c29c75000fd36c37887c8b2
+	sha256sums = 066aa536497ba582b5222548c982477ef894ce9ddc46db52b3a63971a67b40c5
 
 pkgname = lbe
diff --git a/PKGBUILD b/PKGBUILD
index 5b1a5b8e4567..ce1af8760f72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,19 @@
 
 pkgname='lbe'
 pkgver=2.8.2
-pkgrel=8
+pkgrel=9
 pkgdesc="Jarek Gawor's LDAP Browser/Editor (last freeware version)"
 arch=('any')
 #url="http://www.openchannelsoftware.com/projects/LDAP_Browser_Editor"
 url="http://web.archive.org/web/20090201080715/http://mcs.anl.gov/~gawor/ldap/"
 license=('custom')
-depends=('java-runtime=8')
+depends=('java-runtime>=8' 'java-runtime<=11')
 source=("https://nullroute.lt/mirrors/files/ldapbrowser-$pkgver.zip"
         "lbe.desktop"
         "lbe.sh")
 sha256sums=('6c1a1b80b81d83f005d4a006bc070b1b8f44f90151f7af6b14004c96e26687ec'
             'ccdc18f2879c6ab10aa0f3ad087a3aa225a6146340be7e2fb46302b961255972'
-            '3181d3f000e6df4a1dbc86f3860964f2528450dc7c29c75000fd36c37887c8b2')
+            '066aa536497ba582b5222548c982477ef894ce9ddc46db52b3a63971a67b40c5')
 
 package() {
   # Java program files
diff --git a/lbe.sh b/lbe.sh
index f9a6f5fd66c1..e9ff8bd9ab7a 100755
--- a/lbe.sh
+++ b/lbe.sh
@@ -1,8 +1,5 @@
 #!/bin/sh -e
 
-appdir=/usr/lib/lbe
-datadir=/usr/share/lbe
-
 if [ -d ~/.lbe ]; then
 	confdir=~/.lbe
 else
@@ -15,16 +12,16 @@ fi
 # chdir() into it.
 if [ ! -d "$confdir" ]; then
 	mkdir -p -m 0700 "$confdir"
-	cp -a "$datadir"/skel/. "$confdir"/
+	cp -a /usr/share/lbe/skel/. "$confdir"/
 fi
 cd "$confdir"
 
 # Protect session configuration files.
 umask 077
 
-for jvm in /usr/lib/jvm/java-8-{openjdk,jre}; do
+for jvm in /usr/lib/jvm/java-{11-{openjdk,jdk},8-{openjdk,jre}/jre}; do
 	if [ -d "$jvm" ]; then
-		exec "$jvm"/jre/bin/java -jar "$appdir/lbe.jar" "$@"
+		exec "$jvm"/bin/java -jar /usr/lib/lbe/lbe.jar "$@"
 	fi
 done