new jna restore way, again

1 files changed, 9 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index eab2a28e710d..1b343122b37b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,8 @@
 
 pkgname=filebot
 pkgver=4.7.7
-pkgrel=4
+pkgrel=5
+_jnaver=4.2.2
 pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums."
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 url="http://filebot.sourceforge.net/"
@@ -21,11 +22,11 @@ makedepends=('unzip')
 [[ $CARCH == "armv7h" ]] && _intarch=arm
 
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_$pkgver/FileBot_$pkgver-portable.tar.xz
-        http://downloads.sourceforge.net/project/$pkgname/$pkgname/FileBot_4.7.5/FileBot_4.7.5-portable.tar.xz
+        https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
         $pkgname-arch.sh $pkgname.svg $pkgname.desktop)
 
 md5sums=('58d35910d5d164454c7840122a17dace'
-         '8fb4f6d1cc4a136c46e1d8bc416c6df5'
+         '51d0359bcdb999ec0a655c68d399f304'
          '3b51756c50a54447a5e6fb6c052e3453'
          '04f46be047049448dba3f0de29fe192d'
          'f37edd0bba7570904d28ab1681c7a7f3')
@@ -35,25 +36,20 @@ optdepends=('libzen: Support for additional subtitle search engines (Sublight)'
 	    'java-p7zip-binding: Extract archives'
 	    'gvfs: gvfs backends')
 
-noextract=($(for i in ${source[@]}; do basename $i; done))
+#noextract=($(for i in ${source[@]}; do basename $i; done))
 
 build() {
   /bin/true
 }
 
 prepare() {
-  mkdir $pkgver
-  mkdir 4.7.5
-  tar -xJf ./FileBot_$pkgver-portable.tar.xz -C $pkgver
-  tar -xJf ./FileBot_4.7.5-portable.tar.xz -C 4.7.5
-  cd 4.7.5
-  unzip FileBot.jar 2>&1 >/dev/null
+  cd jna-$_jnaver/lib/native/
+  unzip linux-$_intarch.jar 2>&1 >/dev/null
 }
 
 package() {
-  cd "$srcdir"
-  install -Dm644 $pkgver/FileBot.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
-  install -Dm644 4.7.5/com/sun/jna/linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+  install -Dm644 FileBot.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -Dm644 jna-$_jnaver/lib/native/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
   install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
   install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"