cleaned up PKGBUILD, version bump to 8.3.0

5 files changed, 43 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb0adda34315..7e6b32abb205 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
+# Generated by mksrcinfo v8
+# Sat Jun  3 21:45:13 UTC 2017
 pkgbase = gluon-scenebuilder
-	pkgdesc = JavaFX visual layout tool with sereral improvements by Gluon
-	pkgver = 8.2.0
-	pkgrel = 4
-	url = http://gluonhq.com/open-source/scene-builder/
+	pkgdesc = Open-source drag & drop UI design tool for JavaFX by Gluon (bin)
+	pkgver = 8.3.0
+	pkgrel = 1
+	url = https://gluonhq.com/products/scene-builder/
 	arch = any
-	license = Oracle BSD License
-	depends = bash
-	depends = java-environment
+	license = BSD
+	depends = java-environment>=8
 	depends = java-openjfx
-	noextract = SceneBuilder-8.2.0.jar
-	source = http://download.gluonhq.com/scenebuilder/8.2.0/SceneBuilder-8.2.0.jar
+	conflicts = javafx-scenebuilder
+	noextract = scenebuilder-all-8.3.0-all.jar
+	source = http://download.gluonhq.com/scenebuilder/8.3.0/scenebuilder-all-8.3.0-all.jar
+	source = gluon-scenebuilder.sh
 	source = gluon-scenebuilder.desktop
-	source = gluon-scenebuilder
-	sha256sums = 30c98e3969396eefe922ada18c05a884d61a229b9ab61f249079e8f0e58a2c9e
-	sha256sums = b81f8fcd7e61a66dfa481f3e2858fe290fadc999e399b719ef10bdcd7b54e4b6
-	sha256sums = 5dc69e3d4dcc395204567c54243105053c54e7f4633fdeac5de19aec7fc5fd1d
+	sha256sums = ce59812646d6fce13b535f2113ac2ac086284f0cf4a6c43356a690c3e6c19359
+	sha256sums = be575929e72b20f8cbeef6118d13b02783f72206053339a9fcbae21bd7f4b933
+	sha256sums = 85012a1c560592cc0e76d762f1351758d75f6d1ac61eadb3b3b12e21319207fa
 
 pkgname = gluon-scenebuilder
 
diff --git a/PKGBUILD b/PKGBUILD
index 952aa3881838..53efdd2a49ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,30 @@
-# Maintainer: Sander Zuidema <s.zuidema at bazix dot nl>
+# Maintainer: Jean Lucas <jean@4ray.co>
+# Contributor: Sander Zuidema <s.zuidema at bazix dot nl>
 
 pkgname=gluon-scenebuilder
-pkgver=8.2.0
-pkgrel=4
-pkgdesc="JavaFX visual layout tool with sereral improvements by Gluon"
+pkgver=8.3.0
+pkgrel=1
+pkgdesc="Open-source drag & drop UI design tool for JavaFX by Gluon (bin)"
 arch=('any')
-url="http://gluonhq.com/open-source/scene-builder/"
-license=('Oracle BSD License')
-groups=()
-depends=('bash' 'java-environment' 'java-openjfx')
-makedepends=('')
-checkdepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=(
-        http://download.gluonhq.com/scenebuilder/$pkgver/SceneBuilder-$pkgver.jar
-        $pkgname.desktop
-        $pkgname
-)
-noextract=(SceneBuilder-$pkgver.jar)
-sha256sums=('30c98e3969396eefe922ada18c05a884d61a229b9ab61f249079e8f0e58a2c9e'
-            'b81f8fcd7e61a66dfa481f3e2858fe290fadc999e399b719ef10bdcd7b54e4b6'
-            '5dc69e3d4dcc395204567c54243105053c54e7f4633fdeac5de19aec7fc5fd1d')
-prepare=()
+url="https://gluonhq.com/products/scene-builder/"
+license=('BSD')
+depends=('java-environment>=8' 'java-openjfx')
+conflicts=('javafx-scenebuilder')
+source=("http://download.gluonhq.com/scenebuilder/$pkgver/scenebuilder-all-$pkgver-all.jar"
+        "$pkgname.sh"
+        "$pkgname.desktop")
+noextract=("scenebuilder-all-$pkgver-all.jar")
+sha256sums=('ce59812646d6fce13b535f2113ac2ac086284f0cf4a6c43356a690c3e6c19359'
+            'be575929e72b20f8cbeef6118d13b02783f72206053339a9fcbae21bd7f4b933'
+            '85012a1c560592cc0e76d762f1351758d75f6d1ac61eadb3b3b12e21319207fa')
+
 package() {
-  bsdcpio --extract --make-directories LICENSE "com/oracle/javafx/scenebuilder/app/about/scenebuilder-logo.png" < SceneBuilder-$pkgver.jar 
+  bsdcpio --extract --make-directories "LICENSE" "com/oracle/javafx/scenebuilder/app/about/scenebuilder-logo.png" < scenebuilder-all-$pkgver-all.jar 
 
-  # copy files
   cd "$srcdir"
-  mkdir -p "$pkgdir/opt/$pkgname"
-  mkdir -p "$pkgdir/usr/bin"
-  install -m755 SceneBuilder-$pkgver.jar "$pkgdir/opt/$pkgname/$pkgname.jar"
-  install -m755 $pkgname "$pkgdir/usr/bin/$pkgname"  
-  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" 
-  install -Dm644 "com/oracle/javafx/scenebuilder/app/about/scenebuilder-logo.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 0755 "scenebuilder-all-$pkgver-all.jar" "$pkgdir/opt/$pkgname/$pkgname.jar"
+  install -Dm 0755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm 0644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm 0644 "com/oracle/javafx/scenebuilder/app/about/scenebuilder-logo.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/gluon-scenebuilder b/gluon-scenebuilder
deleted file mode 100755
index 86021eda4c8c..000000000000
--- a/gluon-scenebuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec java -jar /opt/gluon-scenebuilder/gluon-scenebuilder.jar $@
diff --git a/gluon-scenebuilder.desktop b/gluon-scenebuilder.desktop
index 210a855e6a53..eacc5cdda0cf 100644
--- a/gluon-scenebuilder.desktop
+++ b/gluon-scenebuilder.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=Gluon-scenebuilder
-Comment=JavaFX visual layout tool with sereral improvements by Gluon
+Name=Gluon Scene Builder
+Comment=Open-source drag & drop UI design tool for JavaFX by Gluon
 Exec=gluon-scenebuilder
 Icon=gluon-scenebuilder
 Terminal=false
diff --git a/gluon-scenebuilder.sh b/gluon-scenebuilder.sh
new file mode 100755
index 000000000000..0bfb6f8b3009
--- /dev/null
+++ b/gluon-scenebuilder.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec java -jar /opt/gluon-scenebuilder/gluon-scenebuilder.jar "$@"