[arch-commits] Commit in teeworlds/trunk (PKGBUILD teeworlds.desktop)

[Sven-Hendrik Haase]

    Date: Wednesday, August 7, 2013 @ 19:44:33
  Author: svenstaro
Revision: 95250

Fix FS#36210

Modified:
  teeworlds/trunk/PKGBUILD
  teeworlds/trunk/teeworlds.desktop

-------------------+
 PKGBUILD          |   54 ++++++++++++++++++++++++++--------------------------
 teeworlds.desktop |   14 -------------
 2 files changed, 27 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-07 17:07:06 UTC (rev 95249)
+++ PKGBUILD	2013-08-07 17:44:33 UTC (rev 95250)
@@ -7,42 +7,42 @@
 pkgname=teeworlds
 pkgver=0.6.2
 pkgrel=1
-pkgdesc="A multiplayer 2D shooter"
+pkgdesc='Multiplayer 2D shooter'
 arch=('i686' 'x86_64')
-url="https://www.teeworlds.com"
+url='https://www.teeworlds.com'
 license=('custom')
 depends=('alsa-lib' 'glu' 'sdl' 'freetype2')
-makedepends=('python' 'bam' 'mesa')
+makedepends=('python' 'bam' 'mesa' 'imagemagick' 'gendesk')
 replaces=('teewars')
-source=(https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz
-        teeworlds.desktop
-		teeworlds.png)
-md5sums=('649f6c05a7b117096b238c07062edc39'
-         '3944aaf7a8c19a83510b2b39c4cddf5f'
-         '44f39e398409232a0e0a431ed46d8cc8')
+source=("https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz")
+md5sums=('649f6c05a7b117096b238c07062edc39')
 
+prepare() {
+  convert "$pkgname-$pkgver-source/other/icons/Teeworlds.ico" "$srcdir/$pkgname.png"
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
+    --name 'Teeworlds' --categories 'Game;ArcadeGame'
+}
+
 build() {
-	# Build teeworlds
-	cd ${srcdir}/${pkgname}-*-source
+  cd "$pkgname-$pkgver-source"
 
-	bam server_release client_release
+  bam server_release client_release
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-*-source
+  cd "$pkgname-$pkgver-source"
 
-	# Install data files
-	mkdir -p ${pkgdir}/usr/share/${pkgname}/data
-	cp -r data/* ${pkgdir}/usr/share/${pkgname}/data
+  # Install data files
+  mkdir -p ${pkgdir}/usr/share/${pkgname}/data
+  cp -r data/* ${pkgdir}/usr/share/${pkgname}/data
+  
+  install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv
+  
+  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${srcdir}/${pkgname}-0.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+  
+  install -Dm644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+}
 
-	install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-	install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv
-
-	install -Dm644 ${srcdir}/${pkgname}.desktop \
-		${pkgdir}/usr/share/applications/${pkgname}.desktop
-	install -Dm644 ${srcdir}/${pkgname}.png \
-		${pkgdir}/usr/share/pixmaps/${pkgname}.png
-
-	install -Dm644 license.txt \
-		${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
+# vim:set ts=2 sw=2 et:

Modified: teeworlds.desktop
===================================================================
--- teeworlds.desktop	2013-08-07 17:07:06 UTC (rev 95249)
+++ teeworlds.desktop	2013-08-07 17:44:33 UTC (rev 95250)
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=teeworlds
-Exec=teeworlds
-Terminal=false
-StartupNotify=false
-
-Name=TeeWorlds
-GenericName=Arcade Game
-Comment=is a multiplayer 2D FPS shooter
-Comment[pl_PL]=wieloosobowa strzelanka FTP w 2D
-
-Categories=Game;ArcadeGame;