thanks zack - finally cleaned up quite a bit. -git being fixed shortly, rel3 actually builds properly.

1 files changed, 45 insertions, 46 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cf3db4f89710..0347dd512f63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,11 +8,12 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 
 pkgname=spearmint
 pkgver=0.5
-pkgrel=2
+pkgrel=3
 _ioq3v1='1.36'
 _ioq3v2='1.32-9'
+_upver='0.5'
 pkgdesc="An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)"
-url="http://spearmint.pw"
+url="http://${pkgname}.pw"
 license=("GPL3" "custom")
 arch=('i686' 'x86_64')
 depends=('sdl2')
@@ -20,26 +21,23 @@ makedepends=('sdl2' 'git')
 optdepends=('curl: use native curl'
 	    'openal: use native openal'
 	    'mumble: support for positional Mumble VoIP (as alternative to in-game VoIP feature)')
-conflicts=('spearmint-git')
-install=spearmint.install
-source=("git+https://github.com/zturtleman/spearmint.git"
-	"https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-data.tar.xz"
-	"${pkgname}.svg"
+conflicts=("${pkgname}-git")
+install=${pkgname}.install
+source=("git+https://github.com/zturtleman/${pkgname}.git"
+	"https://github.com/zturtleman/${pkgname}/releases/download/release-${_upver}/${pkgname}-${_upver}-data.tar.xz"
 	"http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run"
-	"spearmint.desktop"
-	"spearmint.service"
-	"spearmint.launcher"
-	"spearmint-server.launcher"
-	"${pkgname}-${pkgver}-data.tar.xz.sig"
-	"${pkgname}.svg.sig"
+	"${pkgname}.desktop"
+	"${pkgname}.service"
+	"${pkgname}.launcher"
+	"${pkgname}-server.launcher"
+	"${pkgname}-${_upver}-data.tar.xz.sig"
 	"ioquake3-q3a-${_ioq3v2}.run.sig"
-	"spearmint.desktop.sig"
-	"spearmint.service.sig"
-	"spearmint.launcher.sig"
-	"spearmint-server.launcher.sig")
+	"${pkgname}.desktop.sig"
+	"${pkgname}.service.sig"
+	"${pkgname}.launcher.sig"
+	"${pkgname}-server.launcher.sig")
 sha512sums=('SKIP'
             'f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab'
-            'a6991edf1821403be965a40d1534b23b1248c9c6c0aaa23ea7d67e93f03d65610637ac417d6beb9d69c7609249ed68afe90d9a1ce1ad26237dc8e64f072d6d79'
             '2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b'
             '9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a'
             '84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0'
@@ -50,22 +48,23 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
             'SKIP')
 
 prepare() {
   cd ${srcdir}/${pkgname}
-  git checkout release-${pkgver}
+  git checkout release-${_upver}
+
+  # Quake 3 point release pk3s
   cd ${srcdir}
   mkdir -p paks
   chmod 700 ioquake3-q3a-${_ioq3v2}.run
   ./ioquake3-q3a-${_ioq3v2}.run --tar xfC ${srcdir}/paks/.
   for d in baseq3 missionpack;
   do
-    mkdir -p ${srcdir}/${pkgname}/${d}
+    mkdir -p ${srcdir}/q3a/${d}
   done
-  tar -C ${srcdir}/${pkgname}/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
-  tar -C ${srcdir}/${pkgname}/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
+  tar -C ${srcdir}/q3a/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
+  tar -C ${srcdir}/q3a/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
   cd ${srcdir}
   # don't need this anymore.
   rm -rf ${srcdir}/paks
@@ -77,7 +76,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}
   if [[ "${CARCH}" == 'i686' ]];
   then
     _ARCH='x86'
@@ -86,49 +84,50 @@ package() {
     _ARCH=${CARCH}
   fi
 
+  # Base dirs
   install -d -m 755 ${pkgdir}/usr/bin
   install -d -m 755 ${pkgdir}/usr/share/doc/${pkgname}
   install -d -m 755 ${pkgdir}/usr/share/${pkgname}
-  install -d -m 750 ${pkgdir}/opt/spearmint
+  install -d -m 750 ${pkgdir}/opt/${pkgname}
 
   # stuff i wrote
-  install -m 750 ${srcdir}/${pkgname}.launcher ${pkgdir}/opt/spearmint/
-  install -m 750 ${srcdir}/${pkgname}-server.launcher ${pkgdir}/opt/spearmint/
+  install -m 750 ${srcdir}/${pkgname}.launcher ${pkgdir}/opt/${pkgname}/
+  install -m 750 ${srcdir}/${pkgname}-server.launcher ${pkgdir}/opt/${pkgname}/
 
-  # https://github.com/zturtleman/spearmint.git
-  install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}_${_ARCH} ${pkgdir}/opt/spearmint/${pkgname}
-  install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-server_${_ARCH} ${pkgdir}/opt/spearmint/${pkgname}-server
-  install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/spearmint-renderer-opengl1_${_ARCH}.so ${pkgdir}/opt/spearmint/
-  install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/spearmint-renderer-opengl2_${_ARCH}.so ${pkgdir}/opt/spearmint/
+  # https://github.com/zturtleman/${pkgname}.git
+  install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}_${_ARCH} ${pkgdir}/opt/${pkgname}/${pkgname}
+  install -m 750 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-server_${_ARCH} ${pkgdir}/opt/${pkgname}/${pkgname}-server
+  install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-renderer-opengl1_${_ARCH}.so ${pkgdir}/opt/${pkgname}/
+  install -m 640 ${srcdir}/${pkgname}/build/release-linux-${_ARCH}/${pkgname}-renderer-opengl2_${_ARCH}.so ${pkgdir}/opt/${pkgname}/
 
-  # https://github.com/zturtleman/${pkgname}/releases/download/release-${pkgver}/${pkgname}-${pkgver}-data.tar.xz
-  install -m 640 ${srcdir}/${pkgname}-${pkgver}-data/gamecontrollerdb.txt ${pkgdir}/opt/spearmint/
-  install -m 640 ${srcdir}/${pkgname}-${pkgver}-data/spearmint-gamelist.txt ${pkgdir}/opt/spearmint/
-  install -D -m 644 ${srcdir}/${pkgname}-${pkgver}-data/LIBERATION_LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/fonts.license.txt
-  find ${srcdir}/${pkgname}-${pkgver}-data/ -maxdepth 1 -type f -name "*.txt" -exec install -m 644 '{}' ${pkgdir}/usr/share/doc/${pkgname}/. \;
+  # https://github.com/zturtleman/${pkgname}/releases/download/release-${_upver}/${pkgname}-${_upver}-data.tar.xz
+  install -m 640 ${srcdir}/${pkgname}-${_upver}-data/gamecontrollerdb.txt ${pkgdir}/opt/${pkgname}/
+  install -m 640 ${srcdir}/${pkgname}-${_upver}-data/${pkgname}-gamelist.txt ${pkgdir}/opt/${pkgname}/
+  install -D -m 644 ${srcdir}/${pkgname}-${_upver}-data/LIBERATION_LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/fonts.license.txt
+  find ${srcdir}/${pkgname}-${_upver}-data/ -maxdepth 1 -type f -name "*.txt" -exec install -m 644 '{}' ${pkgdir}/usr/share/doc/${pkgname}/. \;
   for d in baseq3 missionpack missionpackoa tademo baseoa demoq3 fonts;
   do
-  	install -d -m 750 ${pkgdir}/opt/spearmint/${d}
-	install -m 640 ${srcdir}/${pkgname}-${pkgver}-data/${d}/* ${pkgdir}/opt/spearmint/${d}/
+  	install -d -m 750 ${pkgdir}/opt/${pkgname}/${d}
+	install -m 640 ${srcdir}/${pkgname}-${_upver}-data/${d}/* ${pkgdir}/opt/${pkgname}/${d}/
   done
 
   # http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run
   for d in baseq3 missionpack;
   do
-	install -m 640 ${srcdir}/${pkgname}/${d}/* ${pkgdir}/opt/spearmint/${d}/
+	install -m 640 ${srcdir}/q3a/${d}/pak?.pk3 ${pkgdir}/opt/${pkgname}/${d}/
   done
 
   cd ${pkgdir}/usr/bin
-  ln -sf /opt/spearmint/${pkgname}.launcher ${pkgname}
-  ln -sf /opt/spearmint/${pkgname}-server.launcher ${pkgname}-server
+  ln -sf /opt/${pkgname}/${pkgname}.launcher ${pkgname}
+  ln -sf /opt/${pkgname}/${pkgname}-server.launcher ${pkgname}-server
 
-  install -D -m 644 ${srcdir}/spearmint.service ${pkgdir}/usr/lib/systemd/system/spearmint.service
-  install -D -m 644 ${srcdir}/spearmint.desktop ${pkgdir}/usr/share/applications/spearmint.desktop
+  install -D -m 644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+  install -D -m 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 
   # icon cleanup
   mkdir -p ${pkgdir}/usr/share/pixmaps/${pkgname}
-  mv ${pkgdir}/usr/share/${pkgname}/${pkgname}.svg ${pkgdir}/usr/share/pixmaps/spearmint.svg
-  mv ${pkgdir}/usr/share/${pkgname}/*.{svg,png} ${pkgdir}/usr/share/pixmaps/${pkgname}/.
+  install -m 644 ${srcdir}/${pkgname}/misc/${pkgname}_text.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+  mv ${srcdir}/${pkgname}/misc/*.{svg,png} ${pkgdir}/usr/share/pixmaps/${pkgname}/.
   find ${pkgdir}/usr/share/${pkgname}/ -type d -exec chmod 755 '{}' \;
   find ${pkgdir}/usr/share/${pkgname}/ -type f -exec chmod 644 '{}' \;