use the actual version for packaging, not the launcher only

3 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdddec1c0a7c..db6fa6dd09b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chunky
 	pkgdesc = Chunky is a Minecraft mapping and rendering tool created by Jesper Öqvist.
 	pkgver = 1.3.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://chunky.llbit.se/
 	arch = any
 	license = GPL3
@@ -9,11 +9,11 @@ pkgbase = chunky
 	makedepends = gendesk
 	makedepends = unzip
 	depends = java-runtime
-	noextract = ChunkyLauncher.jar
-	source = http://chunkyupdate.llbit.se/ChunkyLauncher.jar
+	noextract = Chunky-1.3.1.zip
+	source = https://launchpad.net/chunky/1.3/1.3.1/+download/Chunky-1.3.1.zip
 	source = chunky.sh
-	md5sums = f1596acc7fa964eedbf3c7d2f51ec469
-	md5sums = 44aeea210e55fe35581069a1ac05e57a
+	md5sums = b3b2fba4baa7971d3ae5cee264ce765e
+	md5sums = 3ca19939c7ef56f7768bd6db66b1ecf8
 
 pkgname = chunky
 
diff --git a/PKGBUILD b/PKGBUILD
index d008c7fa8b78..28d7ee5890e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,29 @@
 # Old Maintainer: Lakota Morris <lakota[at]lakotamorris[dot]com>
 pkgname=chunky
 pkgver=1.3.1
-pkgrel=1
+basever=1.3
+pkgrel=2
 pkgdesc="Chunky is a Minecraft mapping and rendering tool created by Jesper Öqvist."
 url="http://chunky.llbit.se/"
 arch=('any')
 license=('GPL3')
 depends=('java-runtime')
 makedepends=('apache-ant' 'gendesk' 'unzip')
-source=(http://chunkyupdate.llbit.se/ChunkyLauncher.jar
+source=(https://launchpad.net/"$pkgname"/"$basever"/"$pkgver"/+download/Chunky-"$pkgver".zip
        chunky.sh)
-noextract=(ChunkyLauncher.jar)
-md5sums=('f1596acc7fa964eedbf3c7d2f51ec469'
-         '44aeea210e55fe35581069a1ac05e57a')
+noextract=(Chunky-"$pkgver".zip)
+md5sums=('b3b2fba4baa7971d3ae5cee264ce765e'
+         '3ca19939c7ef56f7768bd6db66b1ecf8')
 
 build() {
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-  unzip -o -q ChunkyLauncher.jar chunky-cfg.png
+  unzip -o -q Chunky-"$pkgver".zip chunky.jar
+  unzip -o -q chunky.jar chunky-cfg.png
 }
 
 package() {
   install -Dm755 chunky.sh "$pkgdir/usr/bin/chunky"
-  install -Dm644 ChunkyLauncher.jar "$pkgdir/usr/share/java/ChunkyLauncher.jar"
+  install -Dm644 chunky.jar "$pkgdir/usr/share/java/chunky.jar"
   install -Dm644 chunky.desktop "$pkgdir/usr/share/applications/chunky.desktop"
   install -Dm644 chunky-cfg.png "$pkgdir/usr/share/pixmaps/chunky.png"
 }
diff --git a/chunky.sh b/chunky.sh
index 9a7eabf8989e..1cdd662ee23e 100755
--- a/chunky.sh
+++ b/chunky.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-"$JAVA_HOME/bin/java" -jar /usr/share/java/ChunkyLauncher.jar "$@"
+"$JAVA_HOME/bin/java" -jar /usr/share/java/chunky.jar "$@"