Update to 1.6-1

2 files changed, 23 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbce49aec271..3922570a2810 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xz-java
 	pkgdesc = Java library for XZ and LZMA compression
-	pkgver = 1.5
+	pkgver = 1.6
 	pkgrel = 1
 	url = http://tukaani.org/xz/java.html
 	arch = any
@@ -8,10 +8,8 @@ pkgbase = xz-java
 	makedepends = java-environment>=1.4,
 	makedepends = unzip
 	depends = java-runtime>=1.4
-	provides = xz-java
-	conflicts = xz-java
-	source = http://tukaani.org/xz/xz-java-1.5.zip
-	sha256sums = 0146e437b01ac77046d256a2e7537768b6922c49635c27fa40b3cf745bb2db74
+	source = http://tukaani.org/xz/xz-java-1.6.zip
+	sha1sums = 29cb33866bb7aae12851f01ce64e81229837a5d1
 
 pkgname = xz-java
 
diff --git a/PKGBUILD b/PKGBUILD
index 56993be817d6..2ddd5303cca9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,30 @@
-# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
+# Maintainer: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
+# Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
+
 pkgname=xz-java
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
 pkgdesc="Java library for XZ and LZMA compression"
-arch=('any')
+arch=("any")
 url="http://tukaani.org/xz/java.html"
-license=('Public Domain')
-depends=('java-runtime>=1.4')
-makedepends=('java-environment>=1.4', 'unzip')
-provides=('xz-java')
-conflicts=('xz-java')
-source=(http://tukaani.org/xz/xz-java-$pkgver.zip)
-sha256sums=(0146e437b01ac77046d256a2e7537768b6922c49635c27fa40b3cf745bb2db74)
+license=("Public Domain")
+_javaver_=1.4
+depends=("java-runtime>=${_javaver_}")
+makedepends=("java-environment>=${_javaver_}", "unzip")
+source=(http://tukaani.org/xz/${pkgname}-${pkgver}.zip)
 
 build() {
-  cd "$srcdir"
-  javac -source 1.4 -target 1.4 -d . -s src -cp . $(find src | grep \\.java\$)
-  jar -cf xz-java.jar $(find . | grep \\.class\$)
+	cd "${srcdir}"
+
+	javac -source ${_javaver_} -target ${_javaver_} -d . -s src -cp . $(find src | grep \\.java\$)
+	jar -cf ${pkgname}.jar $(find . | grep \\.class\$)
 }
 
 package() {
-  cd "$srcdir"
-  install -d "$pkgdir/usr/lib/"
-  install -m 755 xz-java.jar "$pkgdir/usr/lib/"
+	cd "${srcdir}"
+
+	install -d "${pkgdir}/usr/lib/"
+	install -m 755 ${pkgname}.jar "${pkgdir}/usr/lib/"
 }
+
+sha1sums=('29cb33866bb7aae12851f01ce64e81229837a5d1')