diff options
author | brent s | 2016-04-06 23:55:06 -0400 |
---|---|---|
committer | brent s | 2016-04-06 23:55:06 -0400 |
commit | 60ae1a74787888718bb8e5644e42e6841c48c567 (patch) | |
tree | 66840ed3b688b4312629811ba38dbd6228fcfe6e | |
parent | cb98d634b83a08444662f8d9ef019cbe1b4d3076 (diff) | |
download | aur-60ae1a74787888718bb8e5644e42e6841c48c567.tar.gz |
recs from upstream
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 49 | ||||
-rw-r--r-- | ioquake3-q3a-1.32-9.run.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | ioquake3-q3a-1.32-9.run.sig.sig | bin | 543 -> 0 bytes | |||
-rwxr-xr-x | spearmint-server.launcher | 4 | ||||
-rw-r--r-- | spearmint-server.launcher.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | spearmint-server.launcher.sig.sig | bin | 543 -> 0 bytes | |||
-rw-r--r-- | spearmint.desktop | 4 | ||||
-rw-r--r-- | spearmint.desktop.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | spearmint.desktop.sig.sig | bin | 543 -> 0 bytes | |||
-rw-r--r-- | spearmint.install | 12 | ||||
-rwxr-xr-x | spearmint.launcher | 4 | ||||
-rw-r--r-- | spearmint.launcher.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | spearmint.launcher.sig.sig | bin | 543 -> 0 bytes | |||
-rw-r--r-- | spearmint.service | 18 | ||||
-rw-r--r-- | spearmint.service.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | spearmint.service.sig.sig | bin | 543 -> 0 bytes | |||
-rw-r--r-- | spearmint.svg.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | spearmint.svg.sig.sig | bin | 543 -> 0 bytes | |||
-rw-r--r-- | spearmint.tar.xz.sig | bin | 543 -> 543 bytes | |||
-rw-r--r-- | spearmint.tar.xz.sig.sig | bin | 543 -> 0 bytes |
21 files changed, 48 insertions, 63 deletions
@@ -1,20 +1,16 @@ # Generated by mksrcinfo v8 -# Wed Apr 6 10:15:18 UTC 2016 +# Thu Apr 7 03:55:06 UTC 2016 pkgbase = spearmint - pkgdesc = An improved ioquake3-based Quake 3: Arena client (note: requires pak files from original CD) + pkgdesc = An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3) pkgver = 0.2 - pkgrel = 10 + pkgrel = 13 url = http://spearmint.pw install = spearmint.install arch = i686 arch = x86_64 license = GPL3 depends = sdl2 - provides = quake3 - provides = ioquake3 - conflicts = quake3 - conflicts = ioquake3 - conflicts = ioquake3-git + conflicts = spearmint-git source = spearmint.tar.xz::https://github.com/zturtleman/spearmint/releases/download/release-0.2/spearmint-0.2-linux.tar.xz source = spearmint.svg source = http://ioquake3.org/files/1.36/data/ioquake3-q3a-1.32-9.run @@ -32,10 +28,10 @@ pkgbase = spearmint sha512sums = 53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26 sha512sums = a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79 sha512sums = 2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b - sha512sums = 0c192c23cc180181f5edee12cd085e78f0cdd2d6e8f18dbd27532b76c36f2b0e731b764119a0a44df90411f94d3b7475bd40ae0d9b8f5bb3867442f93172746b - sha512sums = fd75d6633015057c49fdb1cd29dfa16b8b30fd49df2deb0bbbb9da1a5e84179672ee7fee5df6dc57b0e4b6931ab5200f9e6ada5127e57aec5bf29b3e1b020073 - sha512sums = 894a0b07399ea7fcf60c97516e5cf19740693192e896e687fba0aeedee675684d94968e69dc927bdb4a44b4298c82d5b4bdca0cc86e707c21cb44f4f9876aea9 - sha512sums = c7611bf35ace821dcf5829e729c1b0e2f2cc858f2e8ffb491c94990b72990148a8700c1797d715ee2002b3acc10c599d69fa6bc0059c0f9117f64707b6745445 + sha512sums = 9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a + sha512sums = 84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0 + sha512sums = 92fb1693b91fc7e7ba97612990369a0344b23dbdcfd0c3ecbfc5e7519f86caf9348b63e9a641f081ef8ba913fb1f50a4ca830a7107bc939be5c345e89223f640 + sha512sums = 91b9af20e64223d7d7f21e7eb18cac168c9374409358e4e4d7ddad6576ceb68532d67ba82bc525833cd4ae4d8260ea44429299facbfb9186f72f16790f45a023 sha512sums = SKIP sha512sums = SKIP sha512sums = SKIP @@ -1,20 +1,20 @@ # Maintainer: brent s. <bts[at]square-r00t[dot]net> validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B') # Thanks to Slash's ioquake3-git package (https://aur.archlinux.org/packages/ioquake3-git) -# for install files and desktop icon, and general guidance (I owe you a beer!). +# for install files and desktop icon, and general (indirect) guidance (I owe you a beer!). +# Also thanks to the creator, Zack Middleton, who provided a lot of good input on packaging. I owe you a case! pkgname=spearmint pkgver=0.2 -pkgrel=10 +pkgrel=13 _ioq3v1='1.36' _ioq3v2='1.32-9' -pkgdesc="An improved ioquake3-based Quake 3: Arena client (note: requires pak files from original CD)" +pkgdesc="An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)" url="http://spearmint.pw" license=("GPL3") arch=('i686' 'x86_64') depends=('sdl2') -conflicts=('quake3' 'ioquake3' 'ioquake3-git') -provides=('quake3' 'ioquake3') +conflicts=('spearmint-git') install=spearmint.install source=("${pkgname}.tar.xz::https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-linux.tar.xz" "${pkgname}.svg" @@ -33,10 +33,10 @@ source=("${pkgname}.tar.xz::https://github.com/zturtleman/${pkgname}/releases/do sha512sums=('53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26' 'a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79' '2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b' - '0c192c23cc180181f5edee12cd085e78f0cdd2d6e8f18dbd27532b76c36f2b0e731b764119a0a44df90411f94d3b7475bd40ae0d9b8f5bb3867442f93172746b' - 'fd75d6633015057c49fdb1cd29dfa16b8b30fd49df2deb0bbbb9da1a5e84179672ee7fee5df6dc57b0e4b6931ab5200f9e6ada5127e57aec5bf29b3e1b020073' - '894a0b07399ea7fcf60c97516e5cf19740693192e896e687fba0aeedee675684d94968e69dc927bdb4a44b4298c82d5b4bdca0cc86e707c21cb44f4f9876aea9' - 'c7611bf35ace821dcf5829e729c1b0e2f2cc858f2e8ffb491c94990b72990148a8700c1797d715ee2002b3acc10c599d69fa6bc0059c0f9117f64707b6745445' + '9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a' + '84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0' + '92fb1693b91fc7e7ba97612990369a0344b23dbdcfd0c3ecbfc5e7519f86caf9348b63e9a641f081ef8ba913fb1f50a4ca830a7107bc939be5c345e89223f640' + '91b9af20e64223d7d7f21e7eb18cac168c9374409358e4e4d7ddad6576ceb68532d67ba82bc525833cd4ae4d8260ea44429299facbfb9186f72f16790f45a023' 'SKIP' 'SKIP' 'SKIP' @@ -48,7 +48,7 @@ sha512sums=('53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d5 prepare() { cd ${srcdir} mv "${pkgname}-${pkgver}-linux" ${pkgname} - mkdir paks + mkdir -p paks chmod 700 ioquake3-q3a-${_ioq3v2}.run ./ioquake3-q3a-${_ioq3v2}.run --tar xfC ${srcdir}/paks/. tar -C ${srcdir}/${pkgname}/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar @@ -93,29 +93,22 @@ package() { install -d -m 755 ${pkgdir}/usr/bin install -d -m 755 ${pkgdir}/usr/share/doc/${pkgname} - install -d -m 750 ${pkgdir}/opt/quake3/{baseq3,missionpack,settings} - install -m 750 ${srcdir}/${pkgname}.launcher ${pkgdir}/opt/quake3/ - install -m 750 ${srcdir}/${pkgname}-server.launcher ${pkgdir}/opt/quake3/ - install -m 750 ${srcdir}/${pkgname}/${pkgname} ${pkgdir}/opt/quake3/ - install -m 750 ${srcdir}/${pkgname}/${pkgname}-server ${pkgdir}/opt/quake3/ - install -m 750 ${srcdir}/${pkgname}/mint-renderer-opengl*_${_ARCH}.so ${pkgdir}/opt/quake3/ - install -m 640 ${srcdir}/${pkgname}/baseq3/* ${pkgdir}/opt/quake3/baseq3/ - install -m 640 ${srcdir}/${pkgname}/missionpack/* ${pkgdir}/opt/quake3/missionpack/ - install -m 640 ${srcdir}/${pkgname}/settings/* ${pkgdir}/opt/quake3/settings/ + install -d -m 750 ${pkgdir}/opt/spearmint/{baseq3,missionpack} + install -m 750 ${srcdir}/${pkgname}.launcher ${pkgdir}/opt/spearmint/ + install -m 750 ${srcdir}/${pkgname}-server.launcher ${pkgdir}/opt/spearmint/ + install -m 750 ${srcdir}/${pkgname}/${pkgname} ${pkgdir}/opt/spearmint/ + install -m 750 ${srcdir}/${pkgname}/${pkgname}-server ${pkgdir}/opt/spearmint/ + install -m 750 ${srcdir}/${pkgname}/mint-renderer-opengl*_${_ARCH}.so ${pkgdir}/opt/spearmint/ + install -m 640 ${srcdir}/${pkgname}/settings/gamecontrollerdb.txt ${pkgdir}/opt/spearmint/ + install -m 640 ${srcdir}/${pkgname}/baseq3/* ${pkgdir}/opt/spearmint/baseq3/ + install -m 640 ${srcdir}/${pkgname}/missionpack/* ${pkgdir}/opt/spearmint/missionpack/ install -m 644 ${srcdir}/${pkgname}/*.txt ${pkgdir}/usr/share/doc/${pkgname}/ # unneeded since we have the license tracked by pacman rm ${pkgdir}/usr/share/doc/${pkgname}/{COPYING,${pkgname}-${pkgver}-readme}.txt cd ${pkgdir}/usr/bin - ln -sf /opt/quake3/${pkgname}.launcher ${pkgname} - ln -sf /opt/quake3/${pkgname}-server.launcher ${pkgname}-server - ln -sf /opt/quake3/${pkgname}.launcher quake3 - ln -sf /opt/quake3/${pkgname}-server.launcher q3ded - ln -sf /opt/quake3/${pkgname}.launcher ioquake3 - ln -sf /opt/quake3${pkgname}-server.launcher ioq3ded - cd ${pkgdir}/opt/quake3 - ln -sf ${pkgname} ioquake3 - ln -sf ${pkgname}-server ioq3ded + ln -sf /opt/spearmint/${pkgname}.launcher ${pkgname} + ln -sf /opt/spearmint/${pkgname}-server.launcher ${pkgname}-server install -D -m 644 ${srcdir}/spearmint.service ${pkgdir}/usr/lib/systemd/system/spearmint.service diff --git a/ioquake3-q3a-1.32-9.run.sig b/ioquake3-q3a-1.32-9.run.sig Binary files differindex 17f1a9e369f7..22fd1f992875 100644 --- a/ioquake3-q3a-1.32-9.run.sig +++ b/ioquake3-q3a-1.32-9.run.sig diff --git a/ioquake3-q3a-1.32-9.run.sig.sig b/ioquake3-q3a-1.32-9.run.sig.sig Binary files differdeleted file mode 100644 index 3155aa4c8411..000000000000 --- a/ioquake3-q3a-1.32-9.run.sig.sig +++ /dev/null diff --git a/spearmint-server.launcher b/spearmint-server.launcher index 68c98bfa3e87..695d38742e9b 100755 --- a/spearmint-server.launcher +++ b/spearmint-server.launcher @@ -1,4 +1,4 @@ #!/bin/bash -cd /opt/quake3 -/opt/quake3/spearmint-server +set fs_basepath /opt/quake3 +set fs_homepath ${HOME}/.spearmint ${*} +cd /opt/spearmint +/opt/spearmint/spearmint-server +set sv_pure 0 ${*} diff --git a/spearmint-server.launcher.sig b/spearmint-server.launcher.sig Binary files differindex 7827d821cff6..14b34d9e39fc 100644 --- a/spearmint-server.launcher.sig +++ b/spearmint-server.launcher.sig diff --git a/spearmint-server.launcher.sig.sig b/spearmint-server.launcher.sig.sig Binary files differdeleted file mode 100644 index 72963f0c93ae..000000000000 --- a/spearmint-server.launcher.sig.sig +++ /dev/null diff --git a/spearmint.desktop b/spearmint.desktop index e8519f1e8499..aae7010314ce 100644 --- a/spearmint.desktop +++ b/spearmint.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=Quake III: Arena (Spearmint) +Name=Spearmint GenericName=Spearmint -Comment=ioQuake3 - Quake III Open Source Engine (with Spearmint modifications) +Comment=Spearmint (an ioquake3-based engine with numerous improvements) Exec=/usr/bin/spearmint Icon=/usr/share/pixmaps/spearmint.png StartupNotify=true diff --git a/spearmint.desktop.sig b/spearmint.desktop.sig Binary files differindex cc7c4b95e602..ff93319e98b3 100644 --- a/spearmint.desktop.sig +++ b/spearmint.desktop.sig diff --git a/spearmint.desktop.sig.sig b/spearmint.desktop.sig.sig Binary files differdeleted file mode 100644 index ca6ffc013a34..000000000000 --- a/spearmint.desktop.sig.sig +++ /dev/null diff --git a/spearmint.install b/spearmint.install index 6844de9167e3..336481d7c936 100644 --- a/spearmint.install +++ b/spearmint.install @@ -1,15 +1,15 @@ post_install() { groupadd -f games - useradd -r -s /sbin/nologin -c "Spearmint Daemon user" -M -d /opt/quake3 -g games spearmint > /dev/null 2>&1 - chown -R spearmint:games /opt/quake3 + useradd -r -s /sbin/nologin -c "Spearmint Daemon user" -M -d /opt/spearmint -g games spearmint > /dev/null 2>&1 + chown -R spearmint:games /opt/spearmint echo '!!!' echo '!!! NOTE: TO PLAY SPEARMINT, YOU MUST BE PART OF THE "games" GROUP!' echo '!!! To play Spearmint with the Retail Version of Quake III: Arena,' - echo '!!! move the pak0.pk3 file from the original game CD to /opt/quake3/baseq3/' + echo '!!! move the pak0.pk3 file from the original game CD to /opt/spearmint/baseq3/' echo '!!!' echo '!!!' - echo '!!! When you have the .pk3 file(s) installed, you can run the game via: quake3' + echo '!!! When you have the .pk3 file(s) installed, you can run the game via: spearmint' echo '!!! See https://github.com/zturtleman/spearmint/wiki for more documentation.' echo '!!!' } @@ -25,8 +25,8 @@ post_remove() { then groupdel games fi - if [[ -d '/opt/quake3' ]]; + if [[ -d '/opt/spearmint' ]]; then - chown -R root:root /opt/quake3 > /dev/null 2>&1 + chown -R root:root /opt/spearmint > /dev/null 2>&1 fi } diff --git a/spearmint.launcher b/spearmint.launcher index 2ce9c44d5c17..f7e3a72a5b69 100755 --- a/spearmint.launcher +++ b/spearmint.launcher @@ -1,4 +1,4 @@ #!/bin/bash -cd /opt/quake3 -/opt/quake3/spearmint +set fs_basepath /opt/quake3 +set fs_homepath ${HOME}/.spearmint ${*} +cd /opt/spearmint +/opt/spearmint/spearmint +set sv_pure 0 ${*} diff --git a/spearmint.launcher.sig b/spearmint.launcher.sig Binary files differindex 14b27d604765..b70cd6fa1d9d 100644 --- a/spearmint.launcher.sig +++ b/spearmint.launcher.sig diff --git a/spearmint.launcher.sig.sig b/spearmint.launcher.sig.sig Binary files differdeleted file mode 100644 index 51db7a1f770a..000000000000 --- a/spearmint.launcher.sig.sig +++ /dev/null diff --git a/spearmint.service b/spearmint.service index 00c6789523e6..7fc8d8ee6aea 100644 --- a/spearmint.service +++ b/spearmint.service @@ -1,22 +1,18 @@ [Unit] -Description=This service spawns an ioquake3 (Spearmint) dedicated server with sane defaults +Description=This service spawns a Spearmint dedicated server # However, these defaults may not apply to all use cases. # See comments below for further details [Service] User=spearmint -ExecStart=/opt/quake3/spearmint-server +set dedicated 2 +Group=games +ExecStart=/opt/spearmint/spearmint-server.launcher +set sv_public 1 +set fs_game baseq3 +map q3dm17 Restart=on-abort -# there are several options to tweak the server's performance: # net_port defines the UDP-port used for connections to the server -# fs_game should be the mod you want to play. Not necessary for vanilla-q3/FFA -# dedicated 0 is non-dedicted an not available with ioq3ded, 1 is LAN, 2 is Internet -# sv_pure 1 prevents clients from using their own pk3-files -# com_hunkmegs defaults to 56, should be 128/192/256 on a modern system(?) -# rate 25000 defines the rate in which client & server communicate -# snaps 40 defines gamestate-snapshots client & server exchange in secs -# cl_maxpackets 125 max amount of FPS being counted on the server-side +# fs_game should be the game you want to play +# sv_pure 0 allows clients to use pk3-files not present on the server +# sv_public 0 is LAN, 1 is Internet +# com_hunkmegs defaults to 384 megabytes [Install] WantedBy=multi-user.target - diff --git a/spearmint.service.sig b/spearmint.service.sig Binary files differindex 9c72beeb9388..0c30db30b1e8 100644 --- a/spearmint.service.sig +++ b/spearmint.service.sig diff --git a/spearmint.service.sig.sig b/spearmint.service.sig.sig Binary files differdeleted file mode 100644 index 0448b8675999..000000000000 --- a/spearmint.service.sig.sig +++ /dev/null diff --git a/spearmint.svg.sig b/spearmint.svg.sig Binary files differindex c71b6a5d7432..05b38a0c39d3 100644 --- a/spearmint.svg.sig +++ b/spearmint.svg.sig diff --git a/spearmint.svg.sig.sig b/spearmint.svg.sig.sig Binary files differdeleted file mode 100644 index d4ba741bf51c..000000000000 --- a/spearmint.svg.sig.sig +++ /dev/null diff --git a/spearmint.tar.xz.sig b/spearmint.tar.xz.sig Binary files differindex 186363867a1b..63c27f2b8534 100644 --- a/spearmint.tar.xz.sig +++ b/spearmint.tar.xz.sig diff --git a/spearmint.tar.xz.sig.sig b/spearmint.tar.xz.sig.sig Binary files differdeleted file mode 100644 index 60ccb5d0ef50..000000000000 --- a/spearmint.tar.xz.sig.sig +++ /dev/null |