Updated jauth-git to current Java package guidelines and extracted jgoodies-forms from the package to a separate dependency.

1 files changed, 37 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 240d87578678..3b0f08d1f3ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,50 @@
-# Maintainer: Steven Allen <steven@stebalien.com>
+# Maintainer: James An <james@jamesan.ca>
+# Contributor: Steven Allen <steven@stebalien.com>
 
-pkgname=jauth-git
-pkgver=63
+_pkgname=jauth
+pkgname="$_pkgname-git"
+pkgver=r63.bbe0a11
 pkgrel=1
-pkgdesc="A reference desktop client for the google authenticator"
+pkgdesc='A reference desktop client for the google authenticator'
 arch=('any')
-url="https://github.com/mclamp/JAuth"
-license=('custom')
-depends=('java-environment' 'sh')
+url="https://github.com/mclamp/$_pkgname"
+license=('unknown')
+depends=('java-runtime' 'sh' 'jgoodies-forms')
 makedepends=('git')
-source=('git://github.com/mclamp/JAuth.git'
-        'jauth.sh')
-
-sha256sums=('SKIP'
-            '137f1d78427323771b4307031fa71607a48ea1d026bab65e00b84d8236d9b3e2')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=("$_pkgname"::"git+https://github.com/mclamp/$_pkgname.git")
+md5sums=('SKIP')
 
 pkgver() {
-  cd JAuth
-  git rev-list --count HEAD
+    cd "$_pkgname"
+    (
+        set -o pipefail
+        git describe --long --tag 2>/dev/null | sed -r 's/([^-]*-g)/r\1/;s/-/./g' ||
+        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    )
 }
 
 build() {
-  cd JAuth
-  ./makejar
+    cd "$_pkgname"
+
+    JG_COMMON="/usr/share/java/jgoodies-common/*"
+    JG_FORM="/usr/share/java/jgoodies-forms/*"
+    CLASSPATH="$JG_COMMON:$JG_FORM:/usr/share/java/$_pkgname"
+
+    javac -cp "$JG_FORM:." JAuth/AuthenticatorGUI.java
+    printf "#%c/bin/sh\nexec /usr/bin/java -cp $CLASSPATH JAuth.AuthenticatorGUI \"\$@\"\n" ! > "$_pkgname"
 }
 
 package() {
-  install -Dm644 JAuth/JAuth.jar "$pkgdir/usr/share/jauth/JAuth.jar"
-  install -Dm755 jauth.sh "$pkgdir/usr/bin/jauth"
-  install -Dm644 JAuth/README "$pkgdir/usr/share/doc/jauth/README"
-  install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
-  cd "$pkgdir/usr/share/licenses/$pkgname"
-  ln -s ../../doc/jauth/README README
-}
+    cd "$_pkgname"
+
+    for FILE in JAuth/*.class JAuth/logo/* JAuth/fonts/*; do
+        install -Dm644 "$FILE" "$pkgdir/usr/share/java/$_pkgname/$FILE"
+    done
 
-# vim:set ts=2 sw=2 et:
+    install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+    install -Dm644 README "$pkgdir/usr/share/licenses/$_pkgname/README"
+    install -dm755 "$pkgdir/usr/share/doc/$_pkgname"
+    ln -s "/usr/share/licenses/$_pkgname/README" "$pkgdir/usr/share/doc/$_pkgname/README"
+}