summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot2020-11-29 18:05:26 +0100
committerEmmanuel Gil Peyrot2020-11-29 18:05:42 +0100
commit12cc58d89512f528d96ecb196a0288452a52f089 (patch)
treeaec0f758e92eccfd2a81fa308eca6a05d4ffea3d
parent1ed5025f90a329e53a0c55729a97c6665bbfaded (diff)
downloadaur-capbattleship-git.tar.gz
Remove workarounds that have been upstreamed.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--capbattleship.desktop10
3 files changed, 4 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f870961d2d14..e5752051e0bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = capbattleship-git
pkgdesc = A pirate-themed battleship game
- pkgver = v1.0alpha2.r3.gb771f89
+ pkgver = v1.0alpha5.r0.ga765bfa
pkgrel = 1
url = https://forge.tedomum.net/captnfab/capbattleship
arch = any
@@ -10,9 +10,7 @@ pkgbase = capbattleship-git
provides = capbattleship
conflicts = capbattleship
source = git+https://forge.tedomum.net/captnfab/capbattleship.git
- source = capbattleship.desktop
sha384sums = SKIP
- sha384sums = 8ae97f48e815cd1ed8c45716cd315046063f147760439367a65b9a774976b36bb968a44d48159c5a6c7028f15d2bfb13
pkgname = capbattleship-git
diff --git a/PKGBUILD b/PKGBUILD
index 3933a6513f5e..9aeb5e5dad27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
pkgname=capbattleship-git
-pkgver=v1.0alpha2.r3.gb771f89
+pkgver=v1.0alpha5.r0.ga765bfa
pkgrel=1
pkgdesc="A pirate-themed battleship game"
arch=('any')
@@ -11,10 +11,8 @@ makedepends=('git')
depends=('python-pygame')
conflicts=('capbattleship')
provides=('capbattleship')
-source=("git+https://forge.tedomum.net/captnfab/capbattleship.git"
- "capbattleship.desktop")
-sha384sums=('SKIP'
- '8ae97f48e815cd1ed8c45716cd315046063f147760439367a65b9a774976b36bb968a44d48159c5a6c7028f15d2bfb13')
+source=("git+https://forge.tedomum.net/captnfab/capbattleship.git")
+sha384sums=('SKIP')
pkgver() {
cd capbattleship
@@ -29,10 +27,4 @@ build() {
package() {
cd capbattleship
python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
-
- # Otherwise the game doesn’t start.
- mv "$pkgdir"/usr/bin/capbattleship.py "$pkgdir"/usr/bin/capbattleship
-
- install -Dm644 assets/gfx/icon_256px.png "$pkgdir"/usr/share/icons/hicolor/256x256/apps/capbattleship.png
- install -Dm644 ../capbattleship.desktop "$pkgdir"/usr/share/applications/capbattleship.desktop
}
diff --git a/capbattleship.desktop b/capbattleship.desktop
deleted file mode 100644
index fee3e798ca3c..000000000000
--- a/capbattleship.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=CAP: Pirate Battleship
-GenericName=CAP: Pirate Battleship
-Keywords=chat;talk;im;message;xmpp;jabber;
-Exec=capbattleship
-Icon=capbattleship
-Terminal=false
-Type=Application
-Categories=Game;