Update to 6.1.0

3 files changed, 11 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfc7f67ffe3a..941856056467 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = davmail
 	pkgdesc = a POP/IMAP/SMTP/Caldav/LDAP gateway for the exchange service
-	pkgver = 6.0.1
+	pkgver = 6.1.0
 	pkgrel = 1
 	url = http://davmail.sourceforge.net/
 	install = davmail.install
@@ -13,14 +13,12 @@ pkgbase = davmail
 	depends = java-runtime
 	optdepends = java-openjfx: Office 365 browser based authentication
 	optdepends = swt: Fix issues with the tray icon
-	source = http://downloads.sourceforge.net/davmail/davmail-6.0.1-3390.zip
+	source = http://downloads.sourceforge.net/davmail/davmail-6.1.0-3423.zip
 	source = davmail.desktop
-	source = davmail.sh
 	source = davmail@.system_service
 	source = davmail@.user_service
-	md5sums = b48b08a59f4a51efba7b0009a4d72dce
+	md5sums = e26b7e5a363dd53b76393966f1d47db6
 	md5sums = 1df37a6120d88de8df3cb735977336ba
-	md5sums = 1eb24ff2a814058e55846a8e8f238f9b
 	md5sums = 8d373851babe1d8bb860228c8b4db702
 	md5sums = 271e9e66dfdb496d242c9a6102937c65
 
diff --git a/PKGBUILD b/PKGBUILD
index d657c474ec1a..1e6d39fa5c28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Hy Goldsher <hyness-at-freshlegacycode-dot-org>
 # Maintainer: Hy Goldsher <hyness-at-freshlegacycode-dot-org>
 pkgname=davmail
-pkgver=6.0.1
+pkgver=6.1.0
 pkgrel=1
 pkgdesc="a POP/IMAP/SMTP/Caldav/LDAP gateway for the exchange service"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -11,25 +11,23 @@ makedepends=('unzip')
 depends=('java-runtime')
 optdepends=('java-openjfx: Office 365 browser based authentication'
             'swt: Fix issues with the tray icon')
-_rev=3390
+_rev=3423
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-$_rev.zip
         $pkgname.desktop
-        $pkgname.sh
         $pkgname@.system_service
         $pkgname@.user_service)
-md5sums=('b48b08a59f4a51efba7b0009a4d72dce'
+md5sums=('e26b7e5a363dd53b76393966f1d47db6'
          '1df37a6120d88de8df3cb735977336ba'
-         '1eb24ff2a814058e55846a8e8f238f9b'
          '8d373851babe1d8bb860228c8b4db702'
          '271e9e66dfdb496d242c9a6102937c65')
 install=$pkgname.install
 
 package() {
-  install -d $pkgdir/{usr/share/java/$pkgname/lib,usr/bin,etc/$pkgname}
-  install -Dm644 $pkgname.jar $pkgdir/usr/share/java/$pkgname/
-  install -D lib/* $pkgdir/usr/share/java/$pkgname/lib
-  install -Dm755 $srcdir/$pkgname.sh $pkgdir/usr/share/java/$pkgname
-  ln -s /usr/share/java/$pkgname/$pkgname.sh $pkgdir/usr/bin/$pkgname
+  install -d $pkgdir/{usr/share/$pkgname/lib,usr/bin,etc/$pkgname}
+  install -Dm644 $pkgname.jar $pkgdir/usr/share/$pkgname/
+  install -D lib/* $pkgdir/usr/share/$pkgname/lib
+  install -Dm755 $srcdir/$pkgname $pkgdir/usr/share/$pkgname
+  install -Dm755 $srcdir/$pkgname $pkgdir/usr/bin/
   install -Dm644 $srcdir/$pkgname.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop
   install -Dm644 $srcdir/$pkgname\@.system_service ${pkgdir}/usr/lib/systemd/system/$pkgname\@.service
   install -Dm644 $srcdir/$pkgname\@.user_service ${pkgdir}/usr/lib/systemd/user/$pkgname\@.service
diff --git a/davmail.sh b/davmail.sh
deleted file mode 100755
index a5a73a9fda73..000000000000
--- a/davmail.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-DAVMAIL_HOME=/usr/share/java/davmail
-exec "$JAVA_HOME/bin/java" -jar "$DAVMAIL_HOME/davmail.jar" "$@"