Updated to 1.0b1

3 files changed, 34 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 460f194..70a6e2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,50 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
-# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor (Arch): Lone_Wolf <lonewolf@xs4all.nl> 
+# Maintainer (Arch): Sven-Hendrik Haase <svenstaro@gmail.com>
+# Contributor (Arch): Lone_Wolf <lonewolf@xs4all.nl>
 # Contributor (Arch): sausageandeggs <s_stoakley at hotmail.co.uk>
 
 # # I maintain this because:
 # Arch version desktop file points to raw executable
+# Arch version does not name the music archive
 
 pkgname=singularity
-pkgver=0.30c
-_pkgver=007
-pkgrel=9.2
-pkgdesc="Strategy game - simulation of true AI"
+pkgver=1.0b1
+_musicver=025e2696638bcc3bf7690679c3a17c0b46823bbe
+pkgrel=1
+pkgdesc="Endgame: Singularity - simulation of true AI"
 arch=('any')
 url="http://emhsoft.com/singularity/index.html"
 license=('GPL2' 'custom')
-depends=('python2' 'python2-pygame' 'sdl_image' 'sdl_mixer' 'python2-numpy')
-source=("http://www.emhsoft.com/singularity/${pkgname}-${pkgver}-src.tar.gz"
-        "${pkgname}-music-${_pkgver}.zip::http://www.emhsoft.com/singularity/endgame-${pkgname}-music-${_pkgver}.zip"
-        "singularity"
+depends=('python' 'python-pygame' 'python-numpy')
+makedepends=('python-setuptools')
+source=("https://github.com/singularity/singularity/releases/download/v${pkgver}/singularity-${pkgver}.tar.gz"{,.asc}
+        singularity-music-${_musicver}.tar.gz::https://github.com/singularity/singularity-music/archive/${_musicver}.tar.gz
         "singularity.desktop")
-sha512sums=('ffca50c179b745561a25e3fb3525abb862d72f63f533f8a41472067d0ce94c8a236486c9c40a5040335d84e903c498805d591dc546a92d0a7651105103fe114f'
-            'ab46e77c833085f0c5b1b46fef72ab807e79ca422ad043ef67a4bf4384cb0177319f21b4bd01496e6c3fc6fe9a2f36ec256e19f0e829ad7bf9f0c5bd38bf0fe5'
-            '30710a6b7cc78f3e341d6b32a632f3e1f76cdc513b481226b710612d47611cccb037b35fdfc3d2a564b8d16683e2b6bec307e1c3cbf3d830dc90d85d821ad049'
-            '4ec21b1846f38565e1f1227d571bf2b23c97f6fd3cd3bb4267a43e5c4e901dbd1bd86c3a08c61810e34e9a0113a2437932d765dea155614c6fc91d8efb8c64e5')
+validpgpkeys=('B3131A451DBFDF7CA05B4197054BBB9F7D806442')
+b2sums=('e324c4eda0f65b0099675f0470564831b01f81362760639bb274d95379b8a9fb1d8ed8d6e38bf95d8822678041f2a11a48bb8fdd3bc90f29d56ef85c348193f1'
+        'SKIP'
+        '328988697e6a630b7640fa2076fa53ffe5a7c4a3fe4772de6c2ffc4ece3081de4bb57de51159b3ad51f2e54bf796d3775bc40a802e43315aec7767630f8e580f'
+        'fcdd0feef0f26ca623baaf748932a75e0165e0e6941cf62507664cb953a7b1a22b7ee0b55302d45ebaeeffc460d82ab5c043c4ef0b9823fe0174e34805fe7d78')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
 
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|g' "code/singularity.py"
-
-  find . -name \*.pyc -delete
+  mv "$srcdir"/singularity-music-${_musicver} singularity/music
+  sed -i "s|prune|recursive-include singularity/music *|g" MANIFEST.in
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # install game
-  install -Dm644 singularity.py ${pkgdir}/usr/share/singularity/singularity.py
-  cp -R code data "${pkgdir}/usr/share/${pkgname}"
-  cp -R "${srcdir}/endgame-${pkgname}-music-${_pkgver}" "${pkgdir}/usr/share/${pkgname}/music"
+build() {
+  cd "$pkgname-$pkgver"
 
-  # install shell script
-  install -Dm755 "${srcdir}/singularity" "${pkgdir}/usr/bin/singularity"
+  python setup.py build
+}
 
-  # desktop file
-  install -Dm644 "${srcdir}/singularity.desktop" "${pkgdir}/usr/share/applications/singularity.desktop"
-  install -Dm644 "${pkgdir}/usr/share/singularity/data/images/icon.png" "${pkgdir}/usr/share/pixmaps/$pkgname.png"
+package() {
+  cd "$pkgname-$pkgver"
 
-  # license: code is GPL2, but data & music fall under other licenses
-  install -Dm644 README.txt "${pkgdir}/usr/share/doc/${pkgname}/README.txt"
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cd "${pkgdir}/usr/share/licenses/${pkgname}/"
-  ln -s ../../doc/${pkgname}/README.txt .
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  mv run_singularity.sh "$pkgdir"/usr/bin/singularity
 
-  python2 -m compileall "${pkgdir}/usr/share/${pkgname}"
-  python2 -O -m compileall "${pkgdir}/usr/share/${pkgname}"
+  install -Dm644 "$srcdir/singularity.desktop" "$pkgdir/usr/share/applications/singularity.desktop"
+  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE.cc0.txt LICENSE.CC-BY-SA-3.txt LICENSE.gpl.txt LICENSE.txt
 }
diff --git a/singularity b/singularity
deleted file mode 100644
index 28058d2..0000000
--- a/singularity
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/singularity
-exec python2 singularity.py "$@"
diff --git a/singularity.desktop b/singularity.desktop
index 87229a1..160b718 100644
--- a/singularity.desktop
+++ b/singularity.desktop
@@ -1,8 +1,11 @@
 [Desktop Entry]
+Version=1.0
+Type=Application
 Name=Endgame: Singularity
 Comment=Simulation of true AI
+Icon=/usr/share/singularity/data/images/icon.png
 Exec=singularity
-Icon=singularity
+Path=
 Terminal=false
-Type=Application
+StartupNotify=false
 Categories=Game;Simulation;