aur - wuala package fix

diff --git a/PKGBUILD b/PKGBUILD
index 959f44f..97b3536 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,21 +10,34 @@ url="http://wua.la/"
 license=("custom")
 depends=("java-runtime" "rpcbind" "nfs-utils")
 options=(!emptydirs)
-source=(http://wua.la/files/${pkgname}.tar.gz)
+source=("http://wua.la/files/${pkgname}.tar.gz" "wuala-jar-location.patch")
+md5sums=('b1405b131f5a33b25a83765bdddc5e2f'
+         'dad792eb6d07a97f0498ee21cbd02740')
+sha1sums=('3e4914e13329cea56b29168359e2051f1b615f38'
+         'c18d5e9342beb1cf321fe9c29bb5e21838cdb5db')
 
 build() {
        cd ${srcdir}/${pkgname}
 
+       patch -Np1 -i ../wuala-jar-location.patch || return 1
+
+       JAVA_TARG=${pkgdir}/usr/share/java/${pkgname}
+
        # Directories
        install -d ${pkgdir}/usr/{share/${pkgname}/,bin/}
+       install -d ${JAVA_TARG}
+
+       # binary
+       install -D wuala{,cmd} ${pkgdir}/usr/bin/
 
-       # Application
-       install -D * ${pkgdir}/usr/share/${pkgname}/
+       # jar
+       install -D loader3.jar ${JAVA_TARG}/
 
-       # Binaries
-       #ln -s /usr/share/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-       #ln -s /usr/share/${pkgname}/${pkgname}cmd ${pkgdir}/usr/bin/${pkgname}-cmd
-       install -D ${startdir}/extra/${pkgname}-* ${pkgdir}/usr/bin/
+       # readme and copyright
+       install -D readme.txt copyright ${pkgdir}/usr/share/${pkgname}/
+
+       # extras
+       install -D ${startdir}/extra/*-* ${pkgdir}/usr/bin/
 
        # Desktop
        install -D ${startdir}/extra/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
@@ -33,13 +46,4 @@ build() {
        # License
        install -D ${startdir}/extra/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
-       # User
-       install -o ${USER} -m 700 -d ${pkgdir}/${HOME}/{${pkgname}/,.kde4/Autostart/}
-       install -o ${USER} -m 700 -D ${pkgdir}/usr/share/${pkgname}/* ${pkgdir}/${HOME}/${pkgname}/
-       #ln -s /usr/bin/${pkgname}-tray ${pkgdir}/${HOME}/.kde4/Autostart/${pkgname}-tray
-
-       # Old
-       #rm -rf ${pkgdir}/${HOME}/${pkgname}/Prog4/
 }
-
-sha1sums=('3e4914e13329cea56b29168359e2051f1b615f38')
diff --git a/extra/wuala-cmd b/extra/wuala-cmd
index d3ec243..0058ad9 100755
--- a/extra/wuala-cmd
+++ b/extra/wuala-cmd
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-~/wuala/wuala -nogui
+wuala -nogui
diff --git a/extra/wuala-gui b/extra/wuala-gui
index 47e4632..f863e78 100755
--- a/extra/wuala-gui
+++ b/extra/wuala-gui
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-~/wuala/wuala
+wuala
diff --git a/extra/wuala-tray b/extra/wuala-tray
index 4695739..15ca31a 100755
--- a/extra/wuala-tray
+++ b/extra/wuala-tray
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-~/wuala/wuala -silent
+wuala -silent
diff --git a/extra/wuala.desktop b/extra/wuala.desktop
index 65518f5..be37b9b 100644
--- a/extra/wuala.desktop
+++ b/extra/wuala.desktop
@@ -7,5 +7,5 @@ Version=Alpha
 Type=Application
 Terminal=false
 Icon=wuala.png
-Exec=wuala/wuala
+Exec=wuala
 Categories=Application;Network;
diff --git a/wuala-jar-location.patch b/wuala-jar-location.patch
new file mode 100644
index 0000000..bc87cce
--- /dev/null
+++ b/wuala-jar-location.patch
@@ -0,0 +1,13 @@
+diff --git a/wuala b/wuala
+index f74ad1f..ef9a60e 100755
+--- a/wuala
++++ b/wuala
+@@ -8,7 +8,7 @@ function launchWuala() {
+   fi
+   echo $JAVA
+   pushd "$(dirname $0)" > /dev/null
+-  $JAVA -ea -Xmx256m -jar loader3.jar -installed "$@"
++  $JAVA -ea -Xmx256m -jar /usr/share/java/wuala/loader3.jar -installed "$@"
+   popd > /dev/null
+ }
+