sanitize pkgbuild

6 files changed, 15 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55c0b67a9162..dd65360f8aa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,20 +3,22 @@ pkgbase = rednukem-git
 	pkgver = Betav6.r12.g20dbaa8
 	pkgrel = 1
 	url = https://github.com/nukeykt/NRedneck
-	install = rednukem.install
+	install = post_install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	license = custom: BUILD
 	makedepends = mesa
 	makedepends = glu
+	makedepends = gendesk
+	makedepends = imagemagick
 	depends = sdl2_mixer
 	depends = libgl
 	depends = libvpx
 	depends = flac
 	depends = gtk2
 	source = git+https://github.com/nukeykt/NRedneck
-	sha256sums = SKIP
+	md5sums = SKIP
 	makedepends_i686 = nasm
 
 pkgname = rednukem-git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 05ed7f5c0ac7..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!PKGBUILD
-!.SRCINFO
-!rednukem.desktop
-!rednukem.install
-!rednukem.png
diff --git a/PKGBUILD b/PKGBUILD
index e003a4aa05c9..03050e6e31d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
 
-pkgname=('rednukem-git')
+pkgname='rednukem-git'
 pkgver=Betav6.r12.g20dbaa8
 pkgrel=1
 pkgdesc='Redneck Rampage and Duke Nukem 3D port based on EDuke32'
@@ -8,11 +8,11 @@ arch=('i686' 'x86_64')
 url='https://github.com/nukeykt/NRedneck'
 license=('GPL' 'custom: BUILD')
 depends=('sdl2_mixer' 'libgl' 'libvpx' 'flac' 'gtk2')
-makedepends=('mesa' 'glu')
+makedepends=('mesa' 'glu' 'gendesk' 'imagemagick')
 makedepends_i686=('nasm')
-install='rednukem.install'
+install='post_install'
 source=("git+${url}")
-sha256sums=('SKIP')
+md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/NRedneck"
@@ -21,19 +21,17 @@ pkgver() {
 
 build() {
   cd "${srcdir}/NRedneck"
-  msg2 'Building rednukem ...'
-  # add cxxflags, set revision
-  make PACKAGE_REPOSITORY=1 #PRETTY_OUTPUT=0
+  make PACKAGE_REPOSITORY=1
+  convert -verbose source/rr/rsrc/game_icon.ico rednukem.png
+  gendesk -f -n --pkgname "rednukem" --pkgdesc "${pkgdesc}" --exec="rednukem" --categories=Game\;Shooter --icon rednukem
 }
 
 package() {
   cd "${srcdir}/NRedneck"
-  # install binaries, buildlicense, icon and desktop files
-  msg2 'Installing rednukem ...'
   install -d "${pkgdir}/usr/bin"
-  install -m 755 rednukem "${pkgdir}/usr/bin/"
-  install -Dm 644 "package/common/buildlic.txt" "${pkgdir}/usr/share/licenses/${pkgname}/buildlic.txt"
-  install -Dm 644 "../../rednukem.png" "${pkgdir}/usr/share/pixmaps/rednukem.png"
-  install -Dm 644 "../../rednukem.desktop" "${pkgdir}/usr/share/applications/rednukem.desktop"
+  install -m755 rednukem "${pkgdir}/usr/bin/"
+  install -Dm644 "package/common/buildlic.txt" "${pkgdir}/usr/share/licenses/rednukem/LICENSE"
+  install -Dm644 rednukem-10.png "${pkgdir}/usr/share/pixmaps/rednukem.png"
+  install -Dm644 "rednukem.desktop" "${pkgdir}/usr/share/applications/rednukem.desktop"
 }
 # vim:set ts=2 sw=2 et:
\ No newline at end of file
diff --git a/rednukem.install b/post_install
index c766daa88992..c766daa88992 100644
--- a/rednukem.install
+++ b/post_install
diff --git a/rednukem.desktop b/rednukem.desktop
deleted file mode 100644
index c40005b4b62d..000000000000
--- a/rednukem.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=RedNukem
-Comment="Redneck Rampage & Duke Nukem 3D port based on EDuke32"
-Icon=rednukem
-Exec=rednukem
-Categories=Game;Shooter;
-Terminal=false
-StartupNotify=false
\ No newline at end of file
diff --git a/rednukem.png b/rednukem.png
deleted file mode 100644
index 1a755dac05f6..000000000000
--- a/rednukem.png
+++ /dev/null