update to 1.0.0 hopefully fixed the desktop file

4 files changed, 33 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b949b89d1baf..81ff6ebb4543 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
 pkgbase = sulis-bin
 	pkgdesc = Turn based tactical RPG with several campaigns, written in Rust
-	pkgver = 0.6.0
-	pkgrel = 4
+	pkgver = 1.0.0
+	pkgrel = 1
 	url = https://www.sulisgame.com
 	arch = x86_64
 	license = GPL3
+	makedepends = gendesk
 	depends = alsa-lib
 	provides = sulis
-	source = sulis-bin-0.6.0.tar.gz::https://github.com/Grokmoo/sulis/releases/download/0.6.0/sulis-0.6.0-linux64.zip
-	source = sulis.desktop
-	sha256sums = 79fad49f64fc50d61230b1333f1f592f021c97303ee6a239828b06adb8d92d67
-	sha256sums = a50a7a77e277b556310cb0de3847cda3249d661f3487590bb413d26a55288be6
+	source = sulis-bin-1.0.0.tar.gz::https://github.com/Grokmoo/sulis/releases/download/1.0.0/sulis-1.0.0-linux64.zip
+	source = sulis_bin
+	source = sulis.png
+	sha256sums = 433d0108530c5767264d0082de525435e19a4252206477eaca4c9bcb8846fb9f
+	sha256sums = 6d8ced049367da414371ed04a2e420a3a77883cb8df771cf56c70d50ab190bf3
+	sha256sums = 7bffe4886ea6dc139135790f8711611a1cccdc8d3b318ae18ff3227e915c604d
 
 pkgname = sulis-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2a81b8ba25de..4a3310e22373 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,36 @@
 # Maintainer: Lennard Hofmann <lennard dot hofmann at web dot de>
 # Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
 
-pkgname=sulis-bin
-pkgver=0.6.0
-pkgrel=4
+_pkgname=sulis
+pkgname=${_pkgname}-bin
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Turn based tactical RPG with several campaigns, written in Rust"
 arch=('x86_64')
 url="https://www.sulisgame.com"
 license=('GPL3')
 provides=('sulis')
 depends=('alsa-lib')
+makedepends=('gendesk')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Grokmoo/sulis/releases/download/${pkgver}/sulis-${pkgver}-linux64.zip"
-"sulis.desktop")
-sha256sums=('79fad49f64fc50d61230b1333f1f592f021c97303ee6a239828b06adb8d92d67'
-            'a50a7a77e277b556310cb0de3847cda3249d661f3487590bb413d26a55288be6')
+	"sulis_bin"
+	"sulis.png")
+sha256sums=('433d0108530c5767264d0082de525435e19a4252206477eaca4c9bcb8846fb9f'
+            '6d8ced049367da414371ed04a2e420a3a77883cb8df771cf56c70d50ab190bf3'
+            '7bffe4886ea6dc139135790f8711611a1cccdc8d3b318ae18ff3227e915c604d')
 
 prepare() {
-  cd "${srcdir}/sulis"
-  echo "#!/bin/sh
-  cd /opt/sulis
-  ./sulis" > sulis.sh
-  chmod 755 sulis.sh
+	gendesk -f -n --pkgname "sulis" --pkgdesc "${pkgdesc}" --exec="sulis" --categories=Game --icon sulis
 }
 
 package() {
-  cd "${srcdir}/sulis"
-  mkdir -p ${pkgdir}/opt/sulis
-  cp -R ${srcdir}/sulis/* ${pkgdir}/opt/sulis
-  mkdir -p ${pkgdir}/usr/bin
-  ln -s /opt/sulis/sulis.sh ${pkgdir}/usr/bin/sulis
-  install -Dm544 ${startdir}/sulis.desktop  ${pkgdir}/usr/share/applications/sulis.desktop
+	cd ${startdir}
+	install -Dm755 'sulis_bin' "${pkgdir}/usr/bin/sulis"
+	install -Dm644 'sulis.png' -t "${pkgdir}/usr/share/pixmaps"
+	cd "${srcdir}"
+	install -Dm644 'sulis.desktop' -t "${pkgdir}/usr/share/applications"
+	cd "sulis/"
+	mkdir -p ${pkgdir}/opt/sulis
+	cp -R ${srcdir}/sulis/* ${pkgdir}/opt/sulis/
+	install -Dm644 'docs/GPLv3-LICENSE' "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
diff --git a/sulis.desktop b/sulis.desktop
deleted file mode 100644
index fa41a7e55438..000000000000
--- a/sulis.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Sulis
-Comment=sulis
-Exec=sulis
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/sulis_bin b/sulis_bin
new file mode 100644
index 000000000000..624cad9650a4
--- /dev/null
+++ b/sulis_bin
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd '/opt/sulis'
+./sulis