summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rwxr-xr-xPKGBUILD33
-rwxr-xr-xcounter-strike-2d.ChangeLog75
-rwxr-xr-xcs2d-fs.desktop9
-rwxr-xr-xcs2d.desktop3
5 files changed, 22 insertions, 113 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da9c30ae2a6d..062db05d191c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
pkgbase = counter-strike-2d
pkgdesc = More than just a freeware clone of the well known game Counter-Strike
- pkgver = 0.1.2.7
+ pkgver = 1.0.0.2
pkgrel = 1
url = http://www.cs2d.com/
install = cs2d.install
- changelog = counter-strike-2d.ChangeLog
arch = i686
arch = x86_64
license = custom
@@ -21,15 +20,13 @@ pkgbase = counter-strike-2d
backup = opt/cs2d/sys/server.cfg
backup = opt/cs2d/sys/usgn.dat
backup = opt/cs2d/sys/usgn_pw.dat
- source = cs2d_0127_linux.zip::http://www.unrealsoftware.de/get.php?get=cs2d_0127_linux.zip&p=1&cid=get.php?get=cs2d_0127_linux.zip&p=1&cid=16515
- source = cs2d_0127_win.zip::http://www.unrealsoftware.de/get.php?get=cs2d_0127_win.zip&p=1&cid=get.php?get=cs2d_0127_linux.zip&p=1&cid=16515
+ source = cs2d_1002_linux.zip::http://www.unrealsoftware.de/get.php?get=cs2d_1002_linux.zip&p=1&cid=get.php?get=cs2d_1002_linux.zip&p=1&cid=12625
+ source = cs2d_1002_win.zip::http://www.unrealsoftware.de/get.php?get=cs2d_1002_win.zip&p=1&cid=get.php?get=cs2d_1002_linux.zip&p=1&cid=12625
source = cs2d.desktop
- source = cs2d-fs.desktop
source = cs2d.png
- sha512sums = 738be401192a795e76404cf3a97986fcfba2dc082dcec5c546a1c133a50b0a651b2d1f94885f77d830c90b0c37612e615e47fbf51a6f677a56034be62a8c5a6a
- sha512sums = cbc3c7c8246907d8c8d8143679e13144449048df09398b4f25cc50ecae0473d8bc186752418727297da0f79b4b323d272a9e1b97a0b0249243bb9098abc23897
- sha512sums = 9db3ccddf9180461de5bfea671d52f5d7fe3ef9eb00bef69853362983b227315f75f931d8d4ed9e541a56872b461cb8a1864bbbf1cc88b3e9ed3a52c32a01238
- sha512sums = 18cee40fd348ffba864d22f6a1c3e20aeaeba031b0ac0d288885b0d8f82aa553a37047b9793e66440d7e6a008077bd11aeff6cecf6681a38b0a835a1bccf971a
+ sha512sums = f385a6558f40a01324884a8b765f0fcb8dddcfb59bf983be110234a16cf937ba8c0089dce269fd1cec6b51a380810c5e1676e14a95112364b59cbb07e290a8bc
+ sha512sums = b387cd7172fa35c6e66d7457cd4ca457d5bab795944fa9b53a0879301d72d6e5f2c76b760c119df32ae4e69f158e6c593bf921a83e54e25f79cb4e3d2650965c
+ sha512sums = d7d452fa4a2310ec2ac68c2c500e2a66f3a6df2291ad6615f9a957cbc6cb4ccd7f00f9578ccebeb1367aa21205e3743b16463d841c63c73f9b0bfbbf37bd6992
sha512sums = dfe79598af30797195fad38461119f7d611021577a1e1e624567adeceade8f9bc4c97cd110515e492d612d09b740f78faf7dce55448f64a9a698e7748f121a80
pkgname = counter-strike-2d
diff --git a/PKGBUILD b/PKGBUILD
index 105a87c430b1..a7c00e19a168 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
-# Contributor: 404
+# Maintainer: Marcin (CTRL) Wieczorek <marcin@marcin.co>
# Contributor: carstene1ns <url/mail: arch carsten-teibes de>
# Contributor: josephgbr <rafael.f.f1@gmail.com>
# Contributor: Josef Lusticky <evramp@gmail.com>
-# Maintainer Jorge Barroso <jorge.barroso.11 at gmail dot com>
+# Contributor: Jorge Barroso <jorge.barroso.11 at gmail dot com>
pkgname=counter-strike-2d
-pkgver=0.1.2.7
-_ver=0127
+pkgver=1.0.0.2
+_ver=${pkgver//./}
pkgrel=1
pkgdesc="More than just a freeware clone of the well known game Counter-Strike"
arch=('i686' 'x86_64')
url="http://www.cs2d.com/"
license=('custom')
-changelog=$pkgname.ChangeLog
if [ "$CARCH" == "x86_64" ]; then
depends=('lib32-freetype2' 'lib32-libtxc_dxtn' 'lib32-glu')
optdepends=('lib32-openal: audio output'
@@ -20,11 +19,11 @@ if [ "$CARCH" == "x86_64" ]; then
'lib32-intel-dri: video acceleration'
'lib32-nouveau-dri: video acceleration')
elif [ "$CARCH" == "i686" ]; then
-depends=('freetype2' 'libtxc_dxtn' 'glu')
-optdepends=('openal: audio output'
- 'ati-dri: video acceleration'
- 'intel-dri: video acceleration'
- 'nouveau-dri: video acceleration')
+ depends=('freetype2' 'libtxc_dxtn' 'glu')
+ optdepends=('openal: audio output'
+ 'ati-dri: video acceleration'
+ 'intel-dri: video acceleration'
+ 'nouveau-dri: video acceleration')
fi
makedepends=('curl')
@@ -35,23 +34,21 @@ backup=(opt/cs2d/sys/autobuy.cfg opt/cs2d/sys/autoexec.cfg
opt/cs2d/sys/mapcycle.cfg opt/cs2d/sys/more.cfg
opt/cs2d/sys/server.cfg opt/cs2d/sys/usgn.dat
opt/cs2d/sys/usgn_pw.dat)
-sha512sums=('738be401192a795e76404cf3a97986fcfba2dc082dcec5c546a1c133a50b0a651b2d1f94885f77d830c90b0c37612e615e47fbf51a6f677a56034be62a8c5a6a'
- 'cbc3c7c8246907d8c8d8143679e13144449048df09398b4f25cc50ecae0473d8bc186752418727297da0f79b4b323d272a9e1b97a0b0249243bb9098abc23897'
- '9db3ccddf9180461de5bfea671d52f5d7fe3ef9eb00bef69853362983b227315f75f931d8d4ed9e541a56872b461cb8a1864bbbf1cc88b3e9ed3a52c32a01238'
- '18cee40fd348ffba864d22f6a1c3e20aeaeba031b0ac0d288885b0d8f82aa553a37047b9793e66440d7e6a008077bd11aeff6cecf6681a38b0a835a1bccf971a'
- 'dfe79598af30797195fad38461119f7d611021577a1e1e624567adeceade8f9bc4c97cd110515e492d612d09b740f78faf7dce55448f64a9a698e7748f121a80') # hack for generated id, see also https://bbs.archlinux.org/viewtopic.php?id=141195
+sha512sums=('f385a6558f40a01324884a8b765f0fcb8dddcfb59bf983be110234a16cf937ba8c0089dce269fd1cec6b51a380810c5e1676e14a95112364b59cbb07e290a8bc'
+ 'b387cd7172fa35c6e66d7457cd4ca457d5bab795944fa9b53a0879301d72d6e5f2c76b760c119df32ae4e69f158e6c593bf921a83e54e25f79cb4e3d2650965c'
+ 'd7d452fa4a2310ec2ac68c2c500e2a66f3a6df2291ad6615f9a957cbc6cb4ccd7f00f9578ccebeb1367aa21205e3743b16463d841c63c73f9b0bfbbf37bd6992'
+ 'dfe79598af30797195fad38461119f7d611021577a1e1e624567adeceade8f9bc4c97cd110515e492d612d09b740f78faf7dce55448f64a9a698e7748f121a80')
_url=http://www.unrealsoftware.de/get.php?get
grabcid() {
local file=cs2d_${_ver}_linux.zip
- echo "$(curl -Ss "$_url=${file}&p=1" |
- grep -o '"get.php[^"]\+"' | cut -d'"' -f2 | sed 's/&amp;/\&/g')"
+ echo "$(curl -Ss "$_url=${file}&p=1" | grep -o '"get.php[^"]\+"' | cut -d'"' -f2 | sed 's/&amp;/\&/g')"
}
+
_cid=$(grabcid) # this will hide the cmd line above from AUR interface
source=(cs2d_${_ver}_linux.zip::"$_url=cs2d_${_ver}_linux.zip&p=1&cid=${_cid}"
cs2d_${_ver}_win.zip::"$_url=cs2d_${_ver}_win.zip&p=1&cid=${_cid}"
"cs2d.desktop"
- "cs2d-fs.desktop"
"cs2d.png")
options=(emptydirs)
diff --git a/counter-strike-2d.ChangeLog b/counter-strike-2d.ChangeLog
deleted file mode 100755
index c6f9955cefd6..000000000000
--- a/counter-strike-2d.ChangeLog
+++ /dev/null
@@ -1,75 +0,0 @@
-2015-07-21 jorge_barroso <jorge.barroso.11 at gmail dot com>
- * counter-strike-2d 0.1.2.7-1 :
- version updated
-
-2015-06-15 jorge_barroso <jorge.barroso.11 at gmail dot com>
- * counter-strike-2d 0.1.2.5-1 :
- new maintainer
-
-2014-05-17 osense <krupicka.adam@gmail.com>
- * counter-strike-2d 0.1.2.4-1 :
- new maintainer
-
-2014-01-13 carstene1ns <url/mail: arch carsten-teibes de>
- * counter-strike-2d 0.1.2.3-1 :
- rewritten PKGBUILD nearly from scratch
- moved installation to /opt folder
- fix for filenames is not necessary anymore
- removed unzip makedep, using libarchive now
-
-2012-09-15 josephgbr <rafael.f.f1@gmail.com>
- * counter-strike-2d 0.1.2.1-1 :
- added user's files in backup, so they shouldn't be overwritten on install
- added fix to languages' filename, caused by having accent + charset issue
-
-2012-05-09 josephgbr <rafael.f.f1@gmail.com>
- * counter-strike-2d 0.1.2.0-4 :
- fixed source URL, now getting a cid required to download.
-
-2012-05-08 josephgbr <rafael.f.f1@gmail.com>
- * counter-strike-2d 0.1.2.0-3 :
- depends: lua added (needed for server)
- set writer permission to configure files, to avoid 'permission denied'
- when running cs2d as normal user.
-
-2012-05-08 josephgbr <rafael.f.f1@gmail.com>
- * counter-strike-2d 0.1.2.0-1 :
- depends and makedepends reviewed with strace
- sources now get .zip files, and windows archive files are required
- new maintainer
-
-2011-03-28 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.9b-2 :
- chmoded files to 644, dirs to 755
-
-2011-03-27 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.9b-1 :
-
-2010-12-27 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.8b-2 :
- depends: libxxf86vm/lib32-libxxf86vm added
-
-2010-09-18 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.8b-1 :
-
-2010-02-14 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.7b-3 :
- depends: libstdc++5/lib32-libstdc++5 removed
- depends: freetype2/lib32-freetype2 added
- depends: gcc-libs/lib32-gcc-libs added
- cs2d-launcher line 501 edited to launch CounterStrike2D properly
- (`"$bash_prompt"` -> /usr/bin/CounterStrike2D...)
-
-2010-01-01 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.7b-2 :
- depends: libgl/lib32-libgl added
-
-2009-12-26 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.7b-1 :
- ChangeLog added
- SHA1 checksums added
- makedepends: coreutils added
-
-2009-12-11 Josef Lusticky <evramp@gmail.com>
- * counter-strike-2d 0.1.1.6-2 :
- Symbolic link to cs2d-launcher fixed
diff --git a/cs2d-fs.desktop b/cs2d-fs.desktop
deleted file mode 100755
index d309b959ab5b..000000000000
--- a/cs2d-fs.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Icon=cs2d
-Exec=cs2d -fullscreen
-Name=Counter-Strike 2D (Fullscreen)
-Comment=Multiplayer 2D FPS shooter
-Categories=Game;ArcadeGame;
-Terminal=false
-StartupNotify=false
diff --git a/cs2d.desktop b/cs2d.desktop
index 11acbe21bc28..064adb80bbf5 100755
--- a/cs2d.desktop
+++ b/cs2d.desktop
@@ -1,8 +1,7 @@
-#!/usr/bin/env xdg-open
[Desktop Entry]
Type=Application
Icon=cs2d
-Exec=cs2d
+Exec=cs2d -fullscreen
Name=Counter-Strike 2D
Comment=Multiplayer 2D FPS shooter
Categories=Game;ArcadeGame;