upgpkg: jcatgui-9kw 1.1.7, cleanup

5 files changed, 20 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 240a56b424f6..f00125eac433 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
 pkgbase = jcatgui-9kw
 	pkgdesc = An application written to solve jobs or rather to earn credits on 9kw.eu in more comfortable way than in a browser.
-	pkgver = 1.1.6.b
+	pkgver = 1.1.7
 	pkgrel = 1
 	url = https://sites.google.com/site/jcatgui9kw/
 	arch = any
 	license = unknown
+	makedepends = gendesk
+	depends = bash
 	depends = java-runtime
 	source = https://sites.google.com/site/jcatgui9kw/jCatGUI_9kw.zip
-	source = notify.wav
-	source = jcatgui-9kw.desktop
-	source = jcatgui-9kw.png
-	md5sums = 28ffa0b7d05cf8945422f815525b65fa
-	md5sums = 73bbae9aa821442121b423d32cacdc70
-	md5sums = dddc2627da8cfdcbb0bdd03729145a2b
-	md5sums = a4f5f45962d237882135aa652cbd5418
+	sha256sums = 7aefe6dadd035102a20d2e9f398511f195fa395e324d989b93128d18ec7ccad1
 
 pkgname = jcatgui-9kw
 
diff --git a/PKGBUILD b/PKGBUILD
index 86cd1f1aecce..815d570e0ddd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,25 @@
 # Maintainer: Ole Ernst <olebowle[at]gmx[dot]com>
 pkgname=jcatgui-9kw
-pkgver=1.1.6.b
+pkgver=1.1.7
 pkgrel=1
 pkgdesc='An application written to solve jobs or rather to earn credits on 9kw.eu in more comfortable way than in a browser.'
 arch=('any')
 url='https://sites.google.com/site/jcatgui9kw/'
 license=('unknown')
-depends=('java-runtime')
-source=('https://sites.google.com/site/jcatgui9kw/jCatGUI_9kw.zip'
-	'notify.wav'
-        'jcatgui-9kw.desktop'
-	'jcatgui-9kw.png')
-md5sums=('28ffa0b7d05cf8945422f815525b65fa'
-         '73bbae9aa821442121b423d32cacdc70'
-         'dddc2627da8cfdcbb0bdd03729145a2b'
-         'a4f5f45962d237882135aa652cbd5418')
+depends=('bash' 'java-runtime')
+makedepends=('gendesk')
+source=("https://sites.google.com/site/jcatgui9kw/jCatGUI_9kw.zip")
+sha256sums=('7aefe6dadd035102a20d2e9f398511f195fa395e324d989b93128d18ec7ccad1')
+
+prepare() {
+  bsdtar -xf jCatGUI_9kw.jar
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --categories "Network;Scanning;OCR"
+  echo -e "#!/bin/sh\njava -jar /usr/share/java/$pkgname/jCatGUI_9kw.jar" > $pkgname.sh
+}
 
 package() {
-  cd "${srcdir}"
-  install -Dm644 jCatGUI_9kw.jar "${pkgdir}/usr/share/${pkgname}/jCatGUI_9kw.jar"
-  install -Dm644 notify.wav "${pkgdir}/usr/share/${pkgname}/notify.wav"
-  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-} 
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 jCatGUI_9kw.jar "$pkgdir/usr/share/java/$pkgname/jCatGUI_9kw.jar"
+  install -Dm644 resources/logo/128.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
diff --git a/jcatgui-9kw.desktop b/jcatgui-9kw.desktop
deleted file mode 100644
index 2970ebe76426..000000000000
--- a/jcatgui-9kw.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Name=jCatGUI
-Exec=java -jar /usr/share/jcatgui-9kw/jCatGUI_9kw.jar
-StartupNotify=false
-Icon=jcatgui-9kw
-Type=Application
-Categories=Network;
diff --git a/jcatgui-9kw.png b/jcatgui-9kw.png
deleted file mode 100644
index 3e433131fcd2..000000000000
--- a/jcatgui-9kw.png
+++ /dev/null
diff --git a/notify.wav b/notify.wav
deleted file mode 100644
index 0e33bd94bffa..000000000000
--- a/notify.wav
+++ /dev/null