use , replaced mkdir/mv for install -Dm, pinned java version

3 files changed, 12 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f2b68ceba58..544dc47a0953 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,13 +7,13 @@ pkgbase = binnavi
 	license = Apache
 	makedepends = maven
 	makedepends = apache-ant
-	makedepends = java-environment>=8
-	depends = java-runtime>=8
+	makedepends = java-environment=8
+	depends = java-runtime=8
 	depends = postgresql
 	source = binnavi-6.1.0.tar.gz::https://github.com/google/binnavi/archive/v6.1.0.tar.gz
 	source = binnavi
 	sha512sums = 1829a7a44966a9c985d63b28b7bfd2c75050f45c46ba9f24e3548a53292e59755c617c1baf9297967c8c32d858b7c926f40f97f06ea744618f5e3794a1f8cb90
-	sha512sums = bb274ca29a994ef8b98aa77e0be745e297bd2f7e65dd394594169ffec3910b4dd4982e353202c6b201472632a3f7b16bd7d905b7006e21d76b7299b78fc7f390
+	sha512sums = 0e82a391f8b839fe817381568078e53ac6e4e27eabfb222e6381b1b8ab68db6b13a4c5bd8bb079787d0dec7ec4ca4298c6919e2095c3fcdb556d8001a0cd6ea5
 
 pkgname = binnavi
 
diff --git a/PKGBUILD b/PKGBUILD
index 8134a30fc8bd..b948333d4f28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,11 @@ pkgdesc="A binary analysis IDE that allows to inspect, navigate, edit and annota
 arch=('any')
 url="https://github.com/google/binnavi"
 license=('Apache')
-makedepends=('maven' 'apache-ant' 'java-environment>=8')
-depends=('java-runtime>=8' 'postgresql')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/google/binnavi/archive/v6.1.0.tar.gz" 'binnavi')
+makedepends=('maven' 'apache-ant' 'java-environment=8')
+depends=('java-runtime=8' 'postgresql')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/google/binnavi/archive/v${pkgver}.tar.gz" 'binnavi')
 sha512sums=('1829a7a44966a9c985d63b28b7bfd2c75050f45c46ba9f24e3548a53292e59755c617c1baf9297967c8c32d858b7c926f40f97f06ea744618f5e3794a1f8cb90'
-            'bb274ca29a994ef8b98aa77e0be745e297bd2f7e65dd394594169ffec3910b4dd4982e353202c6b201472632a3f7b16bd7d905b7006e21d76b7299b78fc7f390')
+            '0e82a391f8b839fe817381568078e53ac6e4e27eabfb222e6381b1b8ab68db6b13a4c5bd8bb079787d0dec7ec4ca4298c6919e2095c3fcdb556d8001a0cd6ea5')
 
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,15 +20,12 @@ build(){
 }
 
 package() {
-  mkdir -p "${pkgdir}/usr/share/java/binnavi"
-  mkdir -p "${pkgdir}/usr/share/licenses/binnavi"
-  mkdir -p "${pkgdir}/usr/share/binnavi"
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mv README.md "${pkgdir}/usr/share/binnavi/"
-  mv LICENSE "${pkgdir}/usr/share/licenses/binnavi"
+  install -Dm0644 README.md "${pkgdir}/usr/share/binnavi/README.md"
+  install -Dm0644  LICENSE "${pkgdir}/usr/share/licenses/binnavi/LICENSE"
   cd "${srcdir}/${pkgname}-${pkgver}/target/" 
-  mv binnavi-all.jar "${pkgdir}/usr/share/java/binnavi/"
-  install -D -m755 "${srcdir}/binnavi" "${pkgdir}/usr/bin/binnavi"
+  install -Dm0755  binnavi-all.jar "${pkgdir}/usr/share/java/binnavi/binnavi-all.jar"
+  install -D -m0755 "${srcdir}/binnavi" "${pkgdir}/usr/bin/binnavi"
 }
 
 # vim:set et sw=2 ts=2 tw=79:
diff --git a/binnavi b/binnavi
index 3e250d9c3263..c37599dc5f81 100644
--- a/binnavi
+++ b/binnavi
@@ -2,5 +2,5 @@
 # binnavi starter 1.0.0
 # thx to Levente Polyak <anthraxx[at]archlinux[dot]org>
 
-exec /usr/bin/java -jar "/usr/share/java/binnavi/binnavi-all.jar" "$@"
+exec /usr/lib/jvm/java-8-openjdk/jre/bin/java -jar "/usr/share/java/binnavi/binnavi-all.jar" "$@"