From ddc0d7b2c4d4a4e6aa12a7fbe930303d320b6bb7 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 24 Jan 2018 14:27:51 +0100
Subject: [PATCH] Repackage according to the guidelines.

- Implement check()
- Move jar files to specific directory
- Depend on the most broad meta packages
---
 .SRCINFO |  6 +++---
 PKGBUILD | 18 +++++++++++-------
 trang    | 12 +++++-------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 53e6a95..378b24e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = trang
 	pkgdesc = Converts between different schema languages for XML
 	pkgver = 20151127
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/relaxng/jing-trang
 	arch = any
 	license = GPL
-	depends = java-runtime-headless
+	depends = java-environment
 	source = trang-20151127.tar.gz::https://github.com/relaxng/jing-trang/archive/V20151127.tar.gz
 	source = trang
 	sha256sums = 04cdf589abc5651d40f44fbc3415cb094672cb3c977770b2d9f6ea33e6d8932b
-	sha256sums = 1641a4fa0578ddec1afb374a5da75be6816e659f60c98207619f656cb90ca135
+	sha256sums = bba2c24e1ba844b8646ac1159c30889a6d38e864b1ddc5066a7fc6851a9ec78d
 
 pkgname = trang
 
diff --git a/PKGBUILD b/PKGBUILD
index 87715d2..c067a93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
 pkgname=trang
 _pkgname="jing-trang"
 pkgver=20151127
-pkgrel=2
+pkgrel=3
 pkgdesc="Converts between different schema languages for XML"
 url="https://github.com/relaxng/jing-trang"
 arch=('any')
 license=('GPL')
-depends=(java-runtime-headless)
+depends=(java-runtime)
+depends=(java-environment)
 source=(
 	"${pkgname}-${pkgver}.tar.gz::https://github.com/relaxng/${_pkgname}/archive/V${pkgver}.tar.gz"
 	trang
@@ -20,13 +21,16 @@ build() {
   ./ant
 }
 
+check() {
+  cd "$srcdir/${_pkgname}-${pkgver}"
+  ./ant test
+}
+
 package() {
   cd "$srcdir/${_pkgname}-${pkgver}"
-  install -D -m644 build/trang.jar   "${pkgdir}/usr/share/java/trang.jar"
-  install -D -m644 build/jing.jar    "${pkgdir}/usr/share/java/jing.jar"
-  install -D -m644 build/dtdinst.jar "${pkgdir}/usr/share/java/dtdinst.jar"
-  install -D -m755 "${srcdir}/trang" "${pkgdir}/usr/bin/trang" || return 1
+  install -D -m644 -t "$pkgdir/usr/share/java/$pkgname" build/trang.jar build/jing.jar build/dtdinst.jar
+  install -D -m755 "$srcdir/trang" "$pkgdir/usr/bin/trang"
 }
 
 sha256sums=('04cdf589abc5651d40f44fbc3415cb094672cb3c977770b2d9f6ea33e6d8932b'
-            '1641a4fa0578ddec1afb374a5da75be6816e659f60c98207619f656cb90ca135')
+            'bba2c24e1ba844b8646ac1159c30889a6d38e864b1ddc5066a7fc6851a9ec78d')
diff --git a/trang b/trang
index c049c82..6338e80 100644
--- a/trang
+++ b/trang
@@ -2,14 +2,12 @@
 
 if [ "$1" = "classpath" ]
 then
-  CLASSPATH="$2"
+  CP="$2"
   shift 2
 fi
 
-JAVACLASSES=/usr/share/java
-CLASSPATH="${CLASSPATH:-.}:$JAVACLASSES/trang.jar"
-
-export CLASSPATH
-
-exec java com.thaiopensource.relaxng.translate.Driver "$@"
+for jar in /usr/share/java/trang/*.jar; do
+	CP="$CP:$jar"
+done
 
+exec java -cp "$CP" com.thaiopensource.relaxng.translate.Driver "$@"