Clean PKGBUILD in lines with packaging guidelines

3 files changed, 21 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2108f565eb9c..76dfbc78da7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dave_gnukem
 	pkgdesc = 2D scrolling platform shooter inspired by Duke Nukem 1
 	pkgver = 1.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/davidjoffe/dave_gnukem
 	arch = x86_64
 	arch = i686
@@ -11,12 +11,7 @@ pkgbase = dave_gnukem
 	arch = aarch64
 	license = GPL2
 	license = MIT
-	makedepends = gcc-libs
-	depends = sdl
 	depends = sdl_mixer
-	provides = dave_gnukem
-	conflicts = dave_gnukem
-	conflicts = dave_gnukem-git
 	source = https://github.com/davidjoffe/dave_gnukem/archive/1.0.1.tar.gz
 	source = 1.0.1-data.tar.gz::https://github.com/davidjoffe/gnukem_data/archive/1.0.1.tar.gz
 	source = dave_gnukem-wrapper.sh
@@ -24,7 +19,7 @@ pkgbase = dave_gnukem
 	source = dave_gnukem.png
 	sha256sums = 2f00a6c373e270578160a73a5484fb8ec92a9361c7960cb4670856bcdc7a8a14
 	sha256sums = 46c06c5fb7e1ca8d0848c1866d6e1df96e021ddf8cebc7e64d97cfee64232027
-	sha256sums = c3d2e1f3ac0de09d47dda08b3bdd3c39feb10f15c3598109c0823016cff78ff5
+	sha256sums = bdfa7b607418497e6f1448fe6bf407bd4a22fcea5efefedfeda90607566bf7d4
 	sha256sums = baf54018ab7a1b7607b2e726561d2c2ea2c62f7ce12e5056aac9d5b613536fb6
 	sha256sums = 07c150d5fe3cdad974917350ccf4d706eadaf847c5bf49248ef8748ec50c1350
 
diff --git a/PKGBUILD b/PKGBUILD
index dc1ca8c55dee..fcd602e31e86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,43 +3,38 @@
 
 pkgname=dave_gnukem
 pkgver=1.0.1
-pkgrel=1
-pkgdesc="2D scrolling platform shooter inspired by Duke Nukem 1"
+pkgrel=2
+pkgdesc='2D scrolling platform shooter inspired by Duke Nukem 1'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://github.com/davidjoffe/${pkgname}"
+url='https://github.com/davidjoffe/dave_gnukem'
 license=('GPL2' 'MIT')
-source=("https://github.com/davidjoffe/${pkgname}/archive/${pkgver}.tar.gz"
+depends=('sdl_mixer')
+source=("${url}/archive/${pkgver}.tar.gz"
         "${pkgver}-data.tar.gz::https://github.com/davidjoffe/gnukem_data/archive/${pkgver}.tar.gz"
         "${pkgname}-wrapper.sh"
         "${pkgname}.desktop"
-        "${pkgname}.png"
-)
-depends=('sdl' 'sdl_mixer')
-makedepends=('gcc-libs')
-provides=("${pkgname}")
-conflicts=("${pkgname}" "${pkgname}-git")
+        "${pkgname}.png")
 sha256sums=('2f00a6c373e270578160a73a5484fb8ec92a9361c7960cb4670856bcdc7a8a14'
             '46c06c5fb7e1ca8d0848c1866d6e1df96e021ddf8cebc7e64d97cfee64232027'
-            'c3d2e1f3ac0de09d47dda08b3bdd3c39feb10f15c3598109c0823016cff78ff5'
+            'bdfa7b607418497e6f1448fe6bf407bd4a22fcea5efefedfeda90607566bf7d4'
             'baf54018ab7a1b7607b2e726561d2c2ea2c62f7ce12e5056aac9d5b613536fb6'
-            '07c150d5fe3cdad974917350ccf4d706eadaf847c5bf49248ef8748ec50c1350'
-)
+            '07c150d5fe3cdad974917350ccf4d706eadaf847c5bf49248ef8748ec50c1350')
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  make
+  make -C "${pkgname}-${pkgver}"
 }
 
 package() {
   install -Dm755 "${pkgname}-wrapper.sh" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -Dm644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  mkdir -p "${pkgdir}/usr/share/${pkgname}/data"
+
+  install -d "${pkgdir}/usr/share/${pkgname}/data"
   mv "gnukem_data-${pkgver}"/* "${pkgdir}/usr/share/${pkgname}/data"
-  cd "${pkgname}-${pkgver}"
-  install -Dm755 "davegnukem" "${pkgdir}/usr/lib/${pkgname}/${pkgname}"
-  install -Dm644 "HISTORY.txt" "${pkgdir}/usr/share/doc/${pkgname}/HISTORY.txt"
-  install -Dm644 "README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
-  install -Dm644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-GPL"
-  install -Dm644 "MIT-LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-MIT"
-}
\ No newline at end of file
+
+  install -Dm755 "${pkgname}-${pkgver}/davegnukem" "${pkgdir}/usr/share/${pkgname}/${pkgname}"
+  install -Dm644 "${pkgname}-${pkgver}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+  install -Dm644 "${pkgname}-${pkgver}/MIT-LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
+}
+
+# vim: ts=2 sw=2 et:
\ No newline at end of file
diff --git a/dave_gnukem-wrapper.sh b/dave_gnukem-wrapper.sh
index 41667e7580c6..d35b9b27ab46 100644
--- a/dave_gnukem-wrapper.sh
+++ b/dave_gnukem-wrapper.sh
@@ -1,4 +1,2 @@
 #!/bin/sh
-GAME_DATA_DIR=/usr/share/dave_gnukem
-GAME_EXECUTABLE=/usr/lib/dave_gnukem/dave_gnukem
-cd $GAME_DATA_DIR && exec $GAME_EXECUTABLE "$@"
\ No newline at end of file
+cd '/usr/share/dave_gnukem' && exec ./dave_gnukem "$@"
\ No newline at end of file