Version 1.2.4; Use prebuilt jnlp jars from website

3 files changed, 43 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e89f21d9d26..0c4e6159e2db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
-# Generated by mksrcinfo v8
-# Tue Oct 18 12:30:15 UTC 2016
 pkgbase = openecardapp
 	pkgdesc = Open eCard-App (opencard) is an open source alternative of the AusweisApp
-	pkgver = 1.2.3
-	pkgrel = 2
+	pkgver = 1.2.4
+	pkgrel = 1
 	url = https://www.openecard.org
 	arch = any
 	license = GPL3
-	makedepends = maven
-	makedepends = jdk8-openjdk
 	depends = jre8-openjdk
 	depends = pcsclite
-	source = openecardapp-1.2.3.tar.gz::https://codeload.github.com/ecsec/open-ecard/tar.gz/1.2.3
-	source = openecardapp
-	sha256sums = 787e974739bc6034b142034cf9d8fd3977b254a72c65a3ef1105bf575d33e89c
-	sha256sums = 57996ed4c29221efc903a64038217ac4ec67e00950f99dd421ac0fef3b770d74
+	noextract = richclient-1.2.4-20161024-1455.jar
+	noextract = cifs-1.2.4-20161024-1455.jar
+	source = https://jnlp.openecard.org/richclient-1.2.4-20161024-1455.jar
+	source = https://jnlp.openecard.org/cifs-1.2.4-20161024-1455.jar
+	sha256sums = 2768fd0a0fdc1eab5531f72e72221c30301b6978dd599cb1dd278df4edd98684
+	sha256sums = acefa03ac2e97b5d7dcdc2eba754dea0a66fe3499b952d89913586c62fefd513
 
 pkgname = openecardapp
 
diff --git a/PKGBUILD b/PKGBUILD
index d68382045802..e37394dce42f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,49 @@
 #Maintainer: Dominik Heidler <dominik@heidler.eu>
 
 pkgname=openecardapp
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+_jarver="${pkgver}-20161024-1455"
+pkgrel=1
 pkgdesc="Open eCard-App (opencard) is an open source alternative of the AusweisApp"
 arch=('any')
 url="https://www.openecard.org"
 license=("GPL3")
 depends=('jre8-openjdk' 'pcsclite')
-makedepends=('maven' 'jdk8-openjdk')
-source=("$pkgname-$pkgver.tar.gz::https://codeload.github.com/ecsec/open-ecard/tar.gz/$pkgver" "openecardapp")
-sha256sums=('787e974739bc6034b142034cf9d8fd3977b254a72c65a3ef1105bf575d33e89c'
-            '57996ed4c29221efc903a64038217ac4ec67e00950f99dd421ac0fef3b770d74')
+noextract=("richclient-${_jarver}.jar" "cifs-${_jarver}.jar")
+source=("https://jnlp.openecard.org/richclient-${_jarver}.jar" "https://jnlp.openecard.org/cifs-${_jarver}.jar")
+sha256sums=('2768fd0a0fdc1eab5531f72e72221c30301b6978dd599cb1dd278df4edd98684'
+            'acefa03ac2e97b5d7dcdc2eba754dea0a66fe3499b952d89913586c62fefd513')
 
-prepare() {
-	cd "${srcdir}/open-ecard-${pkgver}/clients/richclient"
-	ln -s ../../../src/package src/
-}
+# code for building from source
+#makedepends=('maven' 'jdk8-openjdk')
+#source=("$pkgname-$pkgver.tar.gz::https://codeload.github.com/ecsec/open-ecard/tar.gz/$pkgver" "openecardapp")
+#prepare() {
+#	cd "${srcdir}/open-ecard-${pkgver}/clients/richclient"
+#	ln -s ../../../src/package src/
+#}
+#
+#build() {
+#	cd "${srcdir}/open-ecard-${pkgver}/clients/richclient"
+#	mvn clean install
+#}
+#
+#package() {
+#	install -D -m755 "openecardapp" "${pkgdir}/usr/bin/openecardapp"
+#	#cd "${srcdir}/open-ecard-${pkgver}/clients/richclient/target"
+#	#install -D -m644 "richclient-${pkgver}-bundle-cifs.jar" "${pkgdir}/usr/share/java/openecardapp/OpeneCardApp.jar"
+#}
 
-build() {
-	cd "${srcdir}/open-ecard-${pkgver}/clients/richclient"
-	mvn clean install
+prepare() {
+	cd "$srcdir"
+	echo "#!/bin/sh" > openecardapp
+	echo "" >> openecardapp
+	echo "cd /usr/share/java/openecardapp/" >> openecardapp
+	echo "exec \"\$JAVA_HOME/bin/java\" -cp richclient-${_jarver}.jar:cifs-${_jarver}.jar org.openecard.richclient.RichClient" >> openecardapp
 }
 
 package() {
-	install -D -m755 "openecardapp"               "${pkgdir}/usr/bin/openecardapp"
-	cd "${srcdir}/open-ecard-${pkgver}/clients/richclient/target"
-	install -D -m644 "richclient-${pkgver}-bundle-cifs.jar" "${pkgdir}/usr/share/java/openecardapp/OpeneCardApp.jar"
+	cd "$srcdir"
+	install -D -m755 "openecardapp" "${pkgdir}/usr/bin/openecardapp"
+	install -D -m644 "richclient-${_jarver}.jar" "${pkgdir}/usr/share/java/openecardapp/richclient-${_jarver}.jar"
+	install -D -m644 "cifs-${_jarver}.jar" "${pkgdir}/usr/share/java/openecardapp/cifs-${_jarver}.jar"
 }
diff --git a/openecardapp b/openecardapp
deleted file mode 100755
index 8d3c999ececd..000000000000
--- a/openecardapp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec "$JAVA_HOME/bin/java" -jar /usr/share/java/openecardapp/OpeneCardApp.jar