Update to 5.4 and refactor PKGBUILD

4 files changed, 18 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 835de9dafc2e..2b9b5f7618ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = mrboom
 	pkgdesc = Mr.Boom is a 8 players Bomberman clone
-	pkgver = 5.3
+	pkgver = 5.4
 	pkgrel = 1
 	url = http://mrboom.mumblecore.org
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL2
 	makedepends = git
 	makedepends = libmodplug
@@ -13,11 +12,7 @@ pkgbase = mrboom
 	depends = minizip
 	provides = mrboom
 	conflicts = mrboom
-	source = https://github.com/Javanaise/mrboom-libretro/releases/download/5.3/MrBoom-src-5.3.tar.gz
-	source = mrboom.desktop
-	source = mrboom.svg
-	sha256sums = 75c3812878809c908094416b0d50e8b380d158d0ad12b9ae6a9a95ab926866c1
-	sha256sums = 9903e26eccda473d9ad9bf047161065014c32d97ac74a62f849a8520d80326a5
-	sha256sums = 6f5e6229fe33d81b9f484f5f90778c730fa5f57fb36101233c0b76efdd2b8436
+	source = https://github.com/Javanaise/mrboom-libretro/releases/download/5.4/MrBoom-src-5.4.tar.gz
+	sha256sums = 5f8f612a850a184dc59f03bcc74e279b50bc027d8ca2d9a4927a4caaa570b93a
 
 pkgname = mrboom
diff --git a/PKGBUILD b/PKGBUILD
index fc46b71887e7..f051eb71ea2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,33 @@
-# Maintainer: Michael DeGuzis <mdeguzis@gmail.com>
+# Maintainer:  <reg-archlinux AT klein DOT tuxli DOT ch> 
+# Contributor: Michael DeGuzis <mdeguzis@gmail.com>
 
 pkgname=mrboom
-pkgver=5.3
+pkgver=5.4
 pkgrel=1
 pkgdesc="Mr.Boom is a 8 players Bomberman clone"
-arch=('i686' 'x86_64')
+arch=('any')
 conflicts=('mrboom')
 provides=('mrboom')
 url="http://mrboom.mumblecore.org"
 license=('GPL2')
 makedepends=('git' 'libmodplug' 'sdl2')
 depends=('sdl2_mixer' 'minizip')
-source=(https://github.com/Javanaise/mrboom-libretro/releases/download/$pkgver/MrBoom-src-$pkgver.tar.gz
-#"mrboom::git+https://github.com/Javanaise/mrboom-libretro#tag=${pkgver}"
-		'mrboom.desktop'
-		'mrboom.svg')
-sha256sums=('75c3812878809c908094416b0d50e8b380d158d0ad12b9ae6a9a95ab926866c1'
-            '9903e26eccda473d9ad9bf047161065014c32d97ac74a62f849a8520d80326a5'
-            '6f5e6229fe33d81b9f484f5f90778c730fa5f57fb36101233c0b76efdd2b8436')
+source=("https://github.com/Javanaise/mrboom-libretro/releases/download/$pkgver/MrBoom-src-${pkgver}.tar.gz")
+sha256sums=('5f8f612a850a184dc59f03bcc74e279b50bc027d8ca2d9a4927a4caaa570b93a')
 
 build() {
-  cd "$srcdir/MrBoom-src-$pkgver"
+  cd "${srcdir}/MrBoom-src-${pkgver}"
   make PREFIX=/usr mrboom LIBSDL2=1
 }
 
 package() {
-  cd "$srcdir/MrBoom-src-$pkgver"
-
-  # Install main binary
-  install -d "$pkgdir/usr/bin"
-  install -d "$pkgdir/usr/share/man"
-  install -d "$pkgdir/usr/share/doc"
-  make PREFIX=/usr/share DESTDIR="$pkgdir" install
-  mv "$pkgdir/usr/share/bin/mrboom" "$pkgdir/usr/bin/mrboom"
-  rm -rf "$pkgdir/usr/share/bin"
-  
-  # supplemental files
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/mrboom.desktop"
-  install -Dm644 "$srcdir/$pkgname.svg" "$pkgdir/usr/share/pixmaps/mrboom.svg"
-  install -Dm644 "README.md" "$pkgdir/usr/share/doc/$pkgname"
+  cd "${srcdir}/MrBoom-src-${pkgver}"
+  make PREFIX=/usr/share DESTDIR="${pkgdir}" install
+  install -Dm755 "${pkgdir}/usr/share/bin/mrboom" "${pkgdir}/usr/bin/mrboom"
+  rm -rf "${pkgdir}/usr/share/bin"
+  install -Dm644 "${srcdir}/MrBoom-src-${pkgver}/Assets/${pkgname}.desktop" "${pkgdir}/usr/share/applications/mrboom.desktop"
+  install -Dm644 "${srcdir}/MrBoom-src-${pkgver}/Assets/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/mrboom.png"
+  install -Dm644 "README.md" "${pkgdir}/usr/share/doc/${pkgname}"
 
 }
 
diff --git a/mrboom.desktop b/mrboom.desktop
deleted file mode 100644
index 4d13c95c53e7..000000000000
--- a/mrboom.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Mr. Boom
-Comment=8 players Bomberman
-Exec=mrboom
-Icon=mrboom
-Terminal=false
-Categories=Games;ActionGame;
-Keywords=bomberman;bomb;
diff --git a/mrboom.svg b/mrboom.svg
deleted file mode 100644
index 309636884d2f..000000000000
--- a/mrboom.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" enable-background="new 0 0 100 100"><circle fill="#24396d" cx="50" cy="50" r="50"/><path fill="#1b3460" d="m71.2 76.09l-15.723-22.625 2.264-9.89 6.584-19.75-7.05-5.947-14.743 14.744-16.337 1.165-25.347 25.348c1.776 9.605 6.37 18.791 13.799 26.22 9.09 9.09 20.818 13.947 32.723 14.57l23.835-23.836"/><circle fill="#ff9a8f" cx="64.36" cy="22.09" r="8.25"/><path fill="#ffebd4" d="m63.53 30.841c-.363 1.053-1.658 1.529-2.891 1.067-1.234-.461-1.939-1.687-1.577-2.738l2.606-7.544c.363-1.051 1.656-1.528 2.891-1.066 1.234.461 1.939 1.687 1.576 2.739l-2.605 7.542"/><path fill="#fffcf8" d="m78.44 61.2c0 10.469-8.487 18.955-18.957 18.955h-18.958c-10.47 0-18.958-8.486-18.958-18.957v-15.01c0-10.469 8.487-18.957 18.958-18.957h18.957c10.47 0 18.957 8.488 18.957 18.957v15.01z"/><path fill="#ffc49c" d="m70.923 63.03c0 6.03-4.889 10.92-10.919 10.92h-20.01c-6.03 0-10.919-4.889-10.919-10.92v-12.966c0-6.03 4.889-10.919 10.919-10.919h20.01c6.03 0 10.919 4.888 10.919 10.919v12.966"/><g fill="#2d1505"><path d="m39.668 62.01c0 1.447-1.173 2.619-2.621 2.619-1.447 0-2.621-1.172-2.621-2.619v-10.92c0-1.447 1.174-2.619 2.621-2.619 1.447 0 2.621 1.172 2.621 2.619v10.92"/><path d="m65.57 62.01c0 1.447-1.174 2.619-2.621 2.619-1.447 0-2.621-1.172-2.621-2.619v-10.92c0-1.447 1.174-2.619 2.621-2.619 1.447 0 2.621 1.172 2.621 2.619v10.92"/></g></svg>
\ No newline at end of file