Update to 1.8-1

1 files changed, 19 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2ddd5303cca9..958b65f5c440 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,35 @@
 # Maintainer: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
 # Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
 
-pkgname=xz-java
-pkgver=1.6
+_basename_=xz
+pkgname=${_basename_}-java
+pkgver=1.8
 pkgrel=1
-pkgdesc="Java library for XZ and LZMA compression"
+pkgdesc="A Java library for XZ and LZMA compression"
 arch=("any")
-url="http://tukaani.org/xz/java.html"
+url="http://tukaani.org/${_basename_}/java.html"
 license=("Public Domain")
-_javaver_=1.4
-depends=("java-runtime>=${_javaver_}")
-makedepends=("java-environment>=${_javaver_}", "unzip")
-source=(http://tukaani.org/xz/${pkgname}-${pkgver}.zip)
+depends=("java-runtime>=6")
+makedepends=("java-environment>=6", "ant")
+source=(http://tukaani.org/${_basename_}/${pkgname}-${pkgver}.zip)
+
+prepare() {
+	cd "${srcdir}"
+
+	sed -i "s|sourcever = 1.5|sourcever = 1.6|g" build.properties
+}
 
 build() {
 	cd "${srcdir}"
 
-	javac -source ${_javaver_} -target ${_javaver_} -d . -s src -cp . $(find src | grep \\.java\$)
-	jar -cf ${pkgname}.jar $(find . | grep \\.class\$)
+	ant
 }
 
 package() {
-	cd "${srcdir}"
+	cd "${srcdir}"/build/jar
 
-	install -d "${pkgdir}/usr/lib/"
-	install -m 755 ${pkgname}.jar "${pkgdir}/usr/lib/"
+	install -d "${pkgdir}"/usr/lib/
+	install -m 644 ${_basename_}.jar "${pkgdir}"/usr/lib/${pkgname}.jar
 }
 
-sha1sums=('29cb33866bb7aae12851f01ce64e81229837a5d1')
+sha1sums=('909eb5472e4f4185d77414b7194d59c6b85c7c66')