upgpkg: keystore-explorer 5.4.4-1

5 files changed, 55 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a121b75e4029..fd2b7f1531a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = keystore-explorer
-	pkgdesc = a free GUI replacement for the Java command-line utilities keytool, jarsigner and jadtool
-	pkgver = 5.4.1
+	pkgdesc = KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner
+	pkgver = 5.4.4
 	pkgrel = 1
-	url = http://www.keystore-explorer.org/
-	install = keystore-explorer.install
-	arch = i686
-	arch = x86_64
-	license = GPL
+	url = https://keystore-explorer.org
+	arch = any
+	license = GPL3
+	makedepends = gradle
+	makedepends = java-environment
 	depends = java-runtime
-	source = https://github.com/kaikramer/keystore-explorer/releases/download/v5.4.1/kse-541.zip
-	source = keystore-explorer.desktop
-	md5sums = d21de02af032ebcca0a0bb53f8d8c96c
-	md5sums = dfaa247ab726fe2e44368101399b508d
+	conflicts = keystore-explorer-bin
+	conflicts = keystore-explorer-git
+	source = keystore-explorer-5.4.4.tar.gz::https://github.com/kaikramer/keystore-explorer/archive/v5.4.4.tar.gz
+	sha256sums = 18d60f452e81ab6009df5e5d7b40d5a6f0aca570efd198de44c7980031bf99b1
 
 pkgname = keystore-explorer
 
diff --git a/.gitignore b/.gitignore
index aeda691bdec2..f71c635dafda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-src/
-pkg/
-*.gz
-*.xz
-*.zip
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index a56bb476848c..ca4ab06179d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,50 @@
-# Maintainer: Thomas Kuther <tom@kuther.net>
-# Maintainer: Alexandre Berthaud <alexandre at berthaud dot me>
-pkgname=keystore-explorer
+# Maintainer: "Amhairghin" Oscar Garcia Amor (https://ogarcia.me)
+# Contributor: Thomas Kuther <tom@kuther.net>
+# Contributor: Alexandre Berthaud <alexandre at berthaud dot me>
+
 _pkgname=kse
-pkgver=5.4.1
-_pkgver=${pkgver//./}
+pkgname=keystore-explorer
+pkgver=5.4.4
 pkgrel=1
-pkgdesc="a free GUI replacement for the Java command-line utilities keytool, jarsigner and jadtool"
-arch=('i686' 'x86_64')
-url="http://www.keystore-explorer.org/"
-license=('GPL')
+pkgdesc='KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner'
+arch=('any')
+url='https://keystore-explorer.org'
+license=('GPL3')
 depends=('java-runtime')
-install=${pkgname}.install
-source=("https://github.com/kaikramer/${pkgname}/releases/download/v${pkgver}/${_pkgname}-${_pkgver}.zip"
-        "${pkgname}.desktop")
-md5sums=('d21de02af032ebcca0a0bb53f8d8c96c'
-         'dfaa247ab726fe2e44368101399b508d')
+makedepends=('gradle' 'java-environment')
+conflicts=('keystore-explorer-bin' 'keystore-explorer-git')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kaikramer/${pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('18d60f452e81ab6009df5e5d7b40d5a6f0aca570efd198de44c7980031bf99b1')
 
-package() {
-  cd "${srcdir}/${_pkgname}-${_pkgver}"
+build() {
+  cd "${pkgname}-${pkgver}"/${_pkgname}
+  gradle clean build
+}
 
-  install -d "${pkgdir}/usr/lib/${pkgname}/lib"
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/applications"
+package() {
+  cd "${pkgname}-${pkgver}"
+  # Extract package data
+  bsdtar -xf "${_pkgname}/build/distributions/${_pkgname}-${pkgver}.tar"
 
-  install -D -m644 *.jar "${pkgdir}/usr/lib/${pkgname}"
-  install -D -m644 readme.txt "${pkgdir}/usr/share/doc/${pkgname}"
-  install -D -m644 licenses/license-*.txt "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -D -m644 lib/*.jar "${pkgdir}/usr/lib/${pkgname}/lib"
+  # JAR
+  install -dm755 "${pkgdir}/usr/share/java/${pkgname}"
+  install -Dm644 "${_pkgname}-${pkgver}/lib/"*.jar "${pkgdir}/usr/share/java/${pkgname}"
+  ln -sf . "${pkgdir}/usr/share/java/${pkgname}/lib"
 
-  # install wrapper
-  echo -e "#!/bin/sh\ncd /usr/lib/${pkgname}\njava -jar kse.jar" > kse
-  install -D -m755 kse "${pkgdir}/usr/bin"
+  # Binary
+  install -dm755 "${pkgdir}/usr/bin"
+  install -Dm755 "${_pkgname}-${pkgver}/bin/${_pkgname}" "${pkgdir}/usr/share/java/${pkgname}"
+  ln -sf "/usr/share/java/${pkgname}/lib/kse" "${pkgdir}/usr/bin/kse"
 
-  # install .desktop
-  for i in 16 32 48 128; do
-    install -D -m644 icons/kse_${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/kse.png"
+  # Desktop
+  for size in 16 32 48 128 256 512; do
+    install -Dm644 "${_pkgname}/res/icons/${_pkgname}_${size}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
   done
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications"
-}
+  install -Dm644 "${_pkgname}/res/icons/${_pkgname}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+  install -Dm644 "${_pkgname}/res/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 
-
-# vim:set ts=2 sw=2 et:
+  # Doc
+  install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+  install -Dm644 "${_pkgname}/res/readmes/readme.txt" "${pkgdir}/usr/share/doc/${pkgname}/readme.txt"
+}
diff --git a/keystore-explorer.desktop b/keystore-explorer.desktop
deleted file mode 100644
index 642390e9f77f..000000000000
--- a/keystore-explorer.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=kse
-Icon=kse.png
-Name=KeyStore Explorer
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Utility;Java;
diff --git a/keystore-explorer.install b/keystore-explorer.install
deleted file mode 100644
index 1efba1721b3e..000000000000
--- a/keystore-explorer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-# vim:set ts=2 sw=2 et: