Updated to 1.5.0 and simplified icons and desktop files

1 files changed, 19 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3cbaaab4be77..ae1f7027401a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,33 @@
 # Maintainer: Ruben Solvang <post@rubensolvang.no>
 pkgname=bas21-bin
-pkgver=1.4.6
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="A norwegian accounting and invoice system"
 arch=('x86_64')
 url=https://bas21.no
 license=('custom')
-makedepends=('gendesk' 'icoutils')
-sha256sums=('14d365c6dfdec55ea05009f4ee58ed7ac1f22dc2f09261304bafbb7d4a89cf0b')
+sha256sums=('61a53e037df609cbb5b9e5d134df47cc8e07b3eed972b6c201115c45711b787f')
 options=('!strip')
+depends=('openssl>=1.1.1')
 source=("https://download.bas21.no/bas21/bas21-$pkgver.tar.xz")
 
-prepare() {
-  gendesk -f -n --pkgname "${pkgname%-bin}" --pkgdesc "$pkgdesc" --name='BAS21'
-  icotool -x "${srcdir}/${pkgname%-bin}-${pkgver}/bascore.ico" --index=1
-}
+package() {
+    cd "${srcdir}"
 
-package() { 
-  install -d "${pkgdir}/opt/${pkgname%-bin}"
-  cp -a "bas21-${pkgver}/"* "${pkgdir}/opt/${pkgname%-bin}"
+    # Install BAS21
+    install -dm755 "${pkgdir}/opt"
+    cp --preserve=mode -r "bas21-${pkgver}" "${pkgdir}/opt/bas21"
 
-  install -d "${pkgdir}/usr/bin"
-  ln -s "/opt/${pkgname%-bin}/bas21" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    # Install icons
+    for res in 128x128 16x16 256x256 32x32 48x48; do
+        install -dm755 "${pkgdir}/usr/share/icons/hicolor/${res}/apps"
+        ln -s "/opt/bas21/res/cencit-bascore-${res}.png" "${pkgdir}/usr/share/icons/hicolor/${res}/apps/cencit-bascore.png"
+    done
 
-  install -Dm644 "${srcdir}/bascore_1_256x256x32.png" "${pkgdir}/usr/share/icons/${pkgname%-bin}.png"
-  install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    # Install desktop entry and executable
+    install -dm755 "${pkgdir}/usr/share/applications"
+    install -Dm644 "bas21-${pkgver}/res/cencit-bas21.desktop" "${pkgdir}/usr/share/applications/bas21.desktop"
+    install -dm755 "${pkgdir}/usr/bin"
+    ln -s "/opt/bas21/bas21" "${pkgdir}/usr/bin/bas21"
 }
+