vaudtax 2018

4 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1793401928a..02dc9b424c72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vaudtax
 	pkgdesc = VaudTax
-	pkgver = 2017
-	pkgrel = 2
+	pkgver = 2018
+	pkgrel = 1
 	url = http://www.vd.ch/themes/etat-droit-finances/impots/vaudtax/
 	arch = i686
 	arch = x86_64
@@ -9,10 +9,10 @@ pkgbase = vaudtax
 	depends = webkitgtk2
 	depends = jre8-openjdk
 	depends = gnome-vfs
-	source = vaudtax-1.3.0-production.tar.gz::https://vaudtax-dl.vd.ch/vaudtax2017/telechargement/linux/VaudTax_2017.tar.gz
-	source = execute_from_usr_share.patch
-	md5sums = 5de215e9fa581da2d27e840c099fcc75
-	md5sums = a379a4fdb08eb3ef43f4e0ea8842454c
+	source = vaudtax-2018-1.0.1-production.tar.gz::https://vaudtax-dl.vd.ch/vaudtax2018/telechargement/linux/VaudTax_2018.tar.gz
+	source = vaudtax
+	md5sums = 52f439b6e519643a91a3c980b0d21a61
+	md5sums = 1b797df588e1d3851c67c7aee1f3f844
 
 pkgname = vaudtax
 
diff --git a/PKGBUILD b/PKGBUILD
index 696aee89ee6b..fb94e96012db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Bruno Renié <brutasse@gmail.com>
 pkgname=vaudtax
-pkgver=2017
-_pkgver=1.3.0-production
-pkgrel=2
+pkgver=2018
+_pkgver=1.0.1-production
+pkgrel=1
 pkgdesc="VaudTax"
 url="http://www.vd.ch/themes/etat-droit-finances/impots/vaudtax/"
 depends=('webkitgtk2' 'jre8-openjdk' 'gnome-vfs')
 arch=(i686 x86_64)
 license=('custom')
-source=("$pkgname-$_pkgver.tar.gz::https://vaudtax-dl.vd.ch/vaudtax$pkgver/telechargement/linux/VaudTax_$pkgver.tar.gz"
-'execute_from_usr_share.patch')
+source=("$pkgname-$pkgver-$_pkgver.tar.gz::https://vaudtax-dl.vd.ch/vaudtax$pkgver/telechargement/linux/VaudTax_$pkgver.tar.gz" 'vaudtax')
 _dirname="VaudTax_$pkgver-$_pkgver"
 
 prepare() {
@@ -20,7 +19,9 @@ build() {
 }
 package() {
 	cd "$_dirname"
-	patch -p1 < ../execute_from_usr_share.patch
+
+	# skip provided libwebkitgtk.so
+	rm -rf lib/ubuntu
 
 	_app_home=/usr/share/${pkgname}
 
@@ -30,8 +31,8 @@ package() {
 	cp -r config "${pkgdir}${_app_home}"
 	install -D -m644 version.xml "${pkgdir}${_app_home}/version.xml"
 
-	cp ${pkgname}-${pkgver} "${pkgdir}"${_app_home}/bin/${pkgname}
+	install -m755 ${srcdir}/${pkgname} "${pkgdir}"${_app_home}/bin/${pkgname}
 	ln -s ${_app_home}/bin/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
 }
-md5sums=('5de215e9fa581da2d27e840c099fcc75'
-         'a379a4fdb08eb3ef43f4e0ea8842454c')
+md5sums=('52f439b6e519643a91a3c980b0d21a61'
+         '1b797df588e1d3851c67c7aee1f3f844')
diff --git a/execute_from_usr_share.patch b/execute_from_usr_share.patch
deleted file mode 100644
index 6e3122f91fe4..000000000000
--- a/execute_from_usr_share.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/vaudtax-2017
-+++ b/vaudtax-2017
-@@ -5,11 +5,7 @@
- 
- classpath='lib/dvbern-lib-update.jar'
- 
--if [ ! -f ///$classpath ] ; then
--	cd `dirname $0`
--else
--	cd //
--fi
-+cd /usr/share/vaudtax/
- 
- type java &> /dev/null
- if [ "$?" -ne "0" ] ; then
diff --git a/vaudtax b/vaudtax
new file mode 100644
index 000000000000..bb1266d7394f
--- /dev/null
+++ b/vaudtax
@@ -0,0 +1,11 @@
+# This script starts the application on Linux (like .exe in windows)
+
+#!/bin/bash
+# Unset OS Java-Paths
+unset JAVA_HOME
+unset JDK_HOME
+
+prefix='/usr/share/vaudtax'
+
+classpath='lib/dvbern-lib-update.jar:lib/cryptutil.jar'
+cd $prefix && java -cp $classpath ch.dvbern.lib.update.Launcher