more fixes

3 files changed, 32 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da7c8a1e7052..af3f0a996030 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = asteroids-bin
 	pkgdesc = Anti-stress shooter game
 	pkgver = 1.03
-	pkgrel = 3
+	pkgrel = 4
 	url = https://codeberg.org/Denotatum/Asteroids
 	install = asteroids-bin.install
 	arch = x86_64
 	license = GPLv3
+	makedepends = unzip
 	depends = alsa-lib
 	depends = glu
 	depends = libglvnd
@@ -15,14 +16,13 @@ pkgbase = asteroids-bin
 	depends = libxrandr
 	depends = mesa
 	depends = pulseaudio
-	optdepends = unzip
 	provides = asteroids
 	conflicts = asteroids-bin
 	replaces = asteroids-bin
 	noextract = asteroids-bin-1.03.zip
 	source = asteroids-bin-1.03.zip::https://codeberg.org/attachments/34feeb15-f8f9-460f-a7aa-e5cdcdf72cef
 	source = Asteroids.desktop
-	sha256sums = 113e1514a6ab4e56324aa8aa11a6d3337d931c5fcafad08d3c2b6d15f9fa34a3
+	sha256sums = 0dbfe3bbd25ec9381179ddb5c61b919df14590c75fdf395d678201e807063210
 	sha256sums = f3be9cdabcd8a64cedff55f83123e054d3300dd60bdc88d29894e06d63f69aa5
 
 pkgname = asteroids-bin
diff --git a/Asteroids.desktop b/Asteroids.desktop
index 43557eb06370..e6bc2729e198 100644
--- a/Asteroids.desktop
+++ b/Asteroids.desktop
@@ -1,9 +1,11 @@
 [Desktop Entry]
+Version=1.03
 Type=Application
 Name=Asteroids
-Comment=Modular Synthesis
-Icon=/usr/share/applications/index.icon.png
-Exec=/usr/bin/asteroids
-Terminal=false
+Name[ru]=Астероиды
+Comment=Anti-stress shooter game
+Comment[ru]=Анти-стресс шутер
+Icon=/usr/share/icons/hiclor/64x64/apps/asteroids.png
+Exec=sh -c "asteroids --main-pack /usr/lib/asteroids/Asteroids.pck"
 Categories=Game;ShooterGame
 Keywords=Games
diff --git a/PKGBUILD b/PKGBUILD
index 695e849efc2b..0189cf1a4abd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 _pkgname=asteroids
 pkgname=${_pkgname}-bin
 pkgver=1.03
-pkgrel=3
+pkgrel=4
 pkgdesc='Anti-stress shooter game'
 url='https://codeberg.org/Denotatum/Asteroids'
 license=('GPLv3')
@@ -10,24 +10,40 @@ provides=('asteroids')
 replaces=($pkgname)
 conflicts=($pkgname)
 depends=('alsa-lib' 'glu' 'libglvnd' 'libxcursor' 'libxinerama' 'libxi' 'libxrandr' 'mesa' 'pulseaudio')
-optdepends=('unzip')
+optdepends=()
+makedepends=('unzip')
 _pkgtag="$pkgname-$pkgver"
 _pkgzip="$_pkgtag.zip"
 noextract=("$_pkgzip")
 install="${pkgname}.install"
 source=("$_pkgzip::https://codeberg.org/attachments/34feeb15-f8f9-460f-a7aa-e5cdcdf72cef"
         Asteroids.desktop)
-sha256sums=('113e1514a6ab4e56324aa8aa11a6d3337d931c5fcafad08d3c2b6d15f9fa34a3'
+sha256sums=('0dbfe3bbd25ec9381179ddb5c61b919df14590c75fdf395d678201e807063210'
             'f3be9cdabcd8a64cedff55f83123e054d3300dd60bdc88d29894e06d63f69aa5')
 
 prepare() {
   mkdir -p "$_pkgtag"
-  unzip "$_pkgzip" -o "$_pkgtag"
+  unzip "$_pkgzip" -d "$_pkgtag"
+  mv Asteroids.desktop "$_pkgtag"/
+  cd "$_pkgtag"
+  mkdir ./usr
+  mkdir ./usr/bin
+  mkdir ./usr/lib
+  mkdir ./usr/lib/asteroids
+  mkdir ./usr/share
+  mkdir ./usr/share/applications
+  mkdir ./usr/share/icons
+  mkdir ./usr/share/icons/hicolor
+  mkdir ./usr/share/icons/hicolor/64x64
+  mkdir ./usr/share/icons/hicolor/64x64/apps
+  mv Asteroids.x86_64 ./usr/bin/asteroids
+  mv Asteroids.pck ./usr/lib/asteroids
+  mv Asteroids.desktop ./usr/share/applications/
+  mv index.icon.png ./usr/share/icons/hicolor/64x64/apps/asteroids.png
 }
 
 package() {
-	install ./Asteroids.desktop "${pkgdir}/usr/share/applications"
 	cd "$_pkgtag"
-	install -d "${pkgdir}/usr/share/applications"
-	install -D Asteroids.x86_64 "$pkgdir/usr/bin/asteroids"
+	cp -rf ./ "$pkgdir"/
+	install -m755 -d "$pkgdir"
 }