Updated package xperia-flashtool 0.9.20.0-1

3 files changed, 18 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c61dd63b83f..d34da67f00fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
+# Generated by mksrcinfo v8
+# Sun Apr 24 18:40:22 UTC 2016
 pkgbase = xperia-flashtool
 	pkgdesc = A S1 protocol flashing software for Sony Xperia phones
-	pkgver = 0.9.19.10
+	pkgver = 0.9.20.0
 	pkgrel = 1
 	url = http://www.flashtool.net/
 	arch = i686
 	arch = x86_64
 	license = unknown
 	makedepends = p7zip
-	noextract = ${pkgname}-${pkgver}-x10flasher.jar
+	depends = libselinux
 	options = !strip
-	source = https://dl.dropboxusercontent.com/u/99802211/External_Sources/Xperia%20Flashtool/flashtool-0.9.19.8-linux.tar.7z
-	source = https://dl.dropboxusercontent.com/u/99802211/External_Sources/Xperia%20Flashtool/xperia-flashtool-0.9.19.10-x10flasher.jar
+	source = https://dl.dropboxusercontent.com/u/99802211/External_Sources/Xperia%20Flashtool/flashtool-0.9.20.0-linux.tar.7z
 	source = xperia-flashtool.sh
-	sha256sums = 130f66d707b6242dd61e13d608f7e263320d43bc0bde88a6f273e3fb4aa8da40
-	sha256sums = 797167edf853e7b19cfe6b551785109f15c8d6b10ec12a9ab8499a55189bc335
-	sha256sums = de578c79aa5c9a94c93e461d1d16bed3affbb5728fbc42fe5f2c97ff7cb07d9e
+	sha256sums = 6bb153e5c8af31f260e80aad38bb8a04d4d9213423288c018e9b29df8c0d9cde
+	sha256sums = b6b91cec623461e7b31bc3250045071350237962388ecd6df46bb437bc536803
 
 pkgname = xperia-flashtool
 
diff --git a/PKGBUILD b/PKGBUILD
index 0df514d99f33..b948df9786db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,22 @@
 
 pkgname=xperia-flashtool
 _realname=flashtool
-pkgver=0.9.19.10
-_pkgver=0.9.19.8
+pkgver=0.9.20.0
 pkgrel=1
 pkgdesc="A S1 protocol flashing software for Sony Xperia phones"
 arch=('i686' 'x86_64')
 url="http://www.flashtool.net/"
 license=('unknown')
+depends=('libselinux')
 makedepends=('p7zip')
-source=("https://dl.dropboxusercontent.com/u/99802211/External_Sources/Xperia%20Flashtool/flashtool-${_pkgver}-linux.tar.7z"
-        "https://dl.dropboxusercontent.com/u/99802211/External_Sources/Xperia%20Flashtool/${pkgname}-${pkgver}-x10flasher.jar"
+source=("https://dl.dropboxusercontent.com/u/99802211/External_Sources/Xperia%20Flashtool/flashtool-${pkgver}-linux.tar.7z"
         "${pkgname}.sh")
-sha256sums=('130f66d707b6242dd61e13d608f7e263320d43bc0bde88a6f273e3fb4aa8da40'
-            '797167edf853e7b19cfe6b551785109f15c8d6b10ec12a9ab8499a55189bc335'
-            'de578c79aa5c9a94c93e461d1d16bed3affbb5728fbc42fe5f2c97ff7cb07d9e')
+sha256sums=('6bb153e5c8af31f260e80aad38bb8a04d4d9213423288c018e9b29df8c0d9cde'
+            'b6b91cec623461e7b31bc3250045071350237962388ecd6df46bb437bc536803')
 options=('!strip')
-noextract=('${pkgname}-${pkgver}-x10flasher.jar')
 
 build() {
-  tar xf "${_realname}-${_pkgver}-linux.tar"
-  cp "${pkgname}-${pkgver}-x10flasher.jar" FlashTool/x10flasher.jar
+  tar xf "${_realname}-${pkgver}-linux.tar"
 }
 
 package() {
@@ -36,8 +32,8 @@ package() {
   fi
   popd > /dev/null
   # Install all the program files
-  install -m 755 -d "${pkgdir}/usr/share/java/${pkgname}"
-  cp -rt "${pkgdir}/usr/share/java/${pkgname}" FlashTool/*
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
+  cp -rt "${pkgdir}/usr/lib/${pkgname}" FlashTool/*
   # Install launcher scripts
   install -m 755 -d "${pkgdir}/usr/bin"
   install -m 755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
diff --git a/xperia-flashtool.sh b/xperia-flashtool.sh
index 0ed58167f153..fb569f5893c6 100755
--- a/xperia-flashtool.sh
+++ b/xperia-flashtool.sh
@@ -26,10 +26,10 @@ EOF
   esac
 fi
 
-if [ -d "/usr/share/java/xperia-flashtool/firmwares" ]
+if [ -d "/usr/lib/xperia-flashtool/firmwares" ]
 then
   mkdir -p "$HOME/.flashTool/firmwares"
-  mv /usr/share/java/xperia-flashtool/firmwares/* "$HOME/.flashTool/firmwares"
+  mv /usr/lib/xperia-flashtool/firmwares/* "$HOME/.flashTool/firmwares"
 fi
 
-/usr/share/java/xperia-flashtool/${APP_CMD} $@
+/usr/lib/xperia-flashtool/${APP_CMD} $@