license, depencies, command fixes

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d36e94df3631..d32758587082 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,13 +4,19 @@ pkgbase = xperia-flashtool-git
 	pkgrel = 1
 	url = http://www.flashtool.net/
 	arch = x86_64
-	license = GPL3
+	license = GPL3+
 	makedepends = p7zip
 	makedepends = ant
+	makedepends = gcc
+	makedepends = expat
+	makedepends = zlib
+	makedepends = make
+	makedepends = java-environment-jre
 	depends = libselinux
 	depends = libsystemd
 	depends = glib2
 	depends = mono
+	depends = java-environment
 	source = git://github.com/Androxyde/Flashtool
 	source = Flashtool.desktop
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 020222c7d8f0..2d03931c12b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@ pkgver=master
 pkgrel=1
 pkgdesc='A S1 protocol flashing software for Sony Xperia phones'
 arch=('x86_64')
-license=('GPL3')
+license=('GPL3+')
 url="http://www.flashtool.net/"
-depends=('libselinux' 'libsystemd' 'glib2' 'mono')
-makedepends=('p7zip' 'ant')
+depends=('libselinux' 'libsystemd' 'glib2' 'mono' 'java-environment')
+makedepends=('p7zip' 'ant' 'gcc' 'expat' 'zlib' 'make' 'java-environment-jre')
 source=("git://github.com/Androxyde/Flashtool"
 "Flashtool.desktop")
 md5sums=('SKIP' 'SKIP')
@@ -15,16 +15,17 @@ md5sums=('SKIP' 'SKIP')
 build() {
    cd "$srcdir"/Flashtool
    mkdir ./bin
+   
    ant -buildfile ant/deploy-release.xml
 }
 
 package(){
   # Moving everything to pkg/.
   mkdir "$pkgdir"/usr "$pkgdir"/usr/lib "$pkgdir"/usr/bin "$pkgdir"/usr/share "$pkgdir"/usr/share/applications "$pkgdir"/usr/share/icons
-  mv "$srcdir"/Deploy/FlashTool "$pkgdir"/usr/lib/FlashTool
+  install "/Deploy/FlashTool" "${pkgdir}/usr/lib/FlashTool"
   ln -s /usr/lib/jvm/default "$pkgdir"/usr/lib/FlashTool/x10flasher_native/jre
   ln -s /usr/lib/FlashTool/FlashTool "$pkgdir"/usr/bin/flashtool
-  mv Flashtool.desktop "$pkgdir"/usr/share/applications/Flashtool.desktop
-  mv "$srcdir"/Flashtool/src/gui/ressources/icons/flash_512.png "$pkgdir"/usr/share/icons/Flashtool.png
+  install "Flashtool.desktop" "${pkgdir}/usr/share/applications/Flashtool.desktop"
+  install "/Flashtool/src/gui/ressources/icons/flash_512.png" "${pkgdir}/usr/share/icons/Flashtool.png"
 }