[arch-commits] Commit in singularity/trunk (PKGBUILD singularity)

[Sven-Hendrik Haase]

    Date: Monday, June 29, 2020 @ 01:22:49
  Author: svenstaro
Revision: 655788

upgpkg: singularity 1.0b1-1

Modified:
  singularity/trunk/PKGBUILD
Deleted:
  singularity/trunk/singularity

-------------+
 PKGBUILD    |   60 +++++++++++++++++++++++++---------------------------------
 singularity |    3 --
 2 files changed, 26 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-29 00:28:07 UTC (rev 655787)
+++ PKGBUILD	2020-06-29 01:22:49 UTC (rev 655788)
@@ -1,53 +1,45 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Lone_Wolf <lonewolf at xs4all.nl> 
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: Lone_Wolf <lonewolf at xs4all.nl>
 # Contributor: sausageandeggs <s_stoakley at hotmail.co.uk>
 
 pkgname=singularity
-pkgver=0.30c
-pkgrel=9
-pkgdesc="Strategy game - simulation of true AI"
+pkgver=1.0b1
+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/singularity-${pkgver}-src.tar.gz"
-        "http://www.emhsoft.com/singularity/endgame-singularity-music-007.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}
+        https://github.com/singularity/singularity-music/archive/025e2696638bcc3bf7690679c3a17c0b46823bbe.tar.gz
         "singularity.desktop")
-md5sums=('ea4e7d28dd19c33585691ee608672a63'
-         '36ab600d1f6df24e3550b37289cc7710'
-         'fe74e41d2d35dd1907342dea8b078651'
-         'c0f49fb6d31a2cf4c0b80393df2aad16')
+validpgpkeys=('B3131A451DBFDF7CA05B4197054BBB9F7D806442')
+sha512sums=('1b3f81f899336089f5088b1235abe831428e52284b22817df581237199511bd131a97abdfa6ebb747493706beebd540c9448aa1d0f156cc56ab91683c5a612d4'
+            'SKIP'
+            '9ec095e8882aa3981a4bbfe551f8d61c876fc6d0ee082f558f8e0f3015bfb65d23d76e5c3557a3e9ab41ddfe896eff618934c043ce8cee58709548f02fa81625'
+            'dbb60214acb59e0cb8c9ec98d95c0c21f7f5c215014112ce8902a8ab1ffc20ff8ee95ed28f54a17ce2379cbadfbfe374a1aa4c44d7f865c3400fd504d926ed46')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|g' "code/singularity.py"
+  mv "$srcdir"/singularity-music-* singularity/music
+  sed -i "s|prune|recursive-include singularity/music *|g" MANIFEST.in
+}
 
-  find . -name \*.pyc -delete
+build() {
+  cd "$pkgname-$pkgver"
+
+  python setup.py build
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$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-007" "$pkgdir/usr/share/$pkgname/music"
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  mv run_singularity.sh "$pkgdir"/usr/bin/singularity
 
-  # install shell script
-  install -Dm755 "$srcdir/singularity" "$pkgdir/usr/bin/singularity"
-
-  # desktop file
   install -Dm644 "$srcdir/singularity.desktop" "$pkgdir/usr/share/applications/singularity.desktop"
-
-  # 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 .
-
-  python2 -m compileall "$pkgdir/usr/share/$pkgname"
-  python2 -O -m compileall "$pkgdir/usr/share/$pkgname"
+  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE.cc0.txt LICENSE.CC-BY-SA-3.txt LICENSE.gpl.txt LICENSE.txt
 }
 # vim: sw=2:ts=2 et:

Deleted: singularity
===================================================================
--- singularity	2020-06-29 00:28:07 UTC (rev 655787)
+++ singularity	2020-06-29 01:22:49 UTC (rev 655788)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/singularity
-exec python2 singularity.py "$@"