updating per upstream recs

10 files changed, 22 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fea9702991bc..eb7350dc5b3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Apr  7 04:50:37 UTC 2016
+# Thu Apr  7 08:32:28 UTC 2016
 pkgbase = spearmint-git
 	pkgdesc = An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)-git master:HEAD
 	pkgver = r4064.33b5758
-	pkgrel = 4
+	pkgrel = 5
 	url = http://spearmint.pw
 	install = spearmint.install
 	arch = i686
@@ -16,6 +16,7 @@ pkgbase = spearmint-git
 	optdepends = mumble: support for positional audio (as alternative to in-game VOIP feature)
 	provides = spearmint
 	conflicts = spearmint
+	noextract = upstream.tar.xz
 	source = upstream.tar.xz::https://github.com/zturtleman/spearmint/releases/download/release-0.2/spearmint-0.2-linux.tar.xz
 	source = spearmint-engine::git+https://github.com/zturtleman/spearmint.git
 	source = spearmint-game::git+https://github.com/zturtleman/mint-arena.git
diff --git a/Makefile.local.sig b/Makefile.local.sig
index 83ceeac39816..ca8b53d2ae16 100644
--- a/Makefile.local.sig
+++ b/Makefile.local.sig
diff --git a/PKGBUILD b/PKGBUILD
index d74f4af6080b..7b46b24c96db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 pkgname=spearmint-git
 _pkgname=spearmint
 pkgver=r4064.33b5758
-pkgrel=4
+pkgrel=5
 _ioq3v1='1.36'
 _ioq3v2='1.32-9'
 _upver='0.2'  # upstream release- needed for some pk3's.
@@ -49,6 +49,7 @@ source=("upstream.tar.xz::https://github.com/zturtleman/${_pkgname}/releases/dow
 	"spearmint.launcher.sig"
 	"spearmint-server.launcher.sig"
 	"ioquake3-q3a-${_ioq3v2}.run.sig")
+noextract=("upstream.tar.xz")
 sha512sums=('53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26'
             'SKIP'
             'SKIP'
@@ -104,20 +105,15 @@ prepare() {
   ## Extra .pk3 files needed
   # Demo/ioq3
   cd ${srcdir}
-  mkdir -p paks
   chmod 700 ioquake3-q3a-${_ioq3v2}.run
-  ./ioquake3-q3a-${_ioq3v2}.run --tar xfC ${srcdir}/paks/.
   install -d -m 750 ${srcdir}/${_pkgname}/{baseq3,missionpack}
-  tar -C ${srcdir}/${_pkgname}/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
-  tar -C ${srcdir}/${_pkgname}/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
+  ./ioquake3-q3a-${_ioq3v2}.run --tar --wildcards -xO ./idpatch*.tar 2> /dev/null | tar -xC ${srcdir}/${_pkgname}/baseq3/. > /dev/null 2>&1  # i am ashamed to admit how long it took me to figure this out.
+  ./ioquake3-q3a-${_ioq3v2}.run --tar --wildcards -xO ./idtapatch*.tar 2> /dev/null | tar -xC ${srcdir}/${_pkgname}/missionpack/. > /dev/null 2>&1
   # upstream
   cd ${srcdir}
-  mv "${_pkgname}-${_upver}-linux" ${_pkgname}_upstream
-  cp -a ${srcdir}/${_pkgname}_upstream/baseq3/* ${srcdir}/${_pkgname}/baseq3/.
-  cp -a ${srcdir}/${_pkgname}_upstream/missionpack/* ${srcdir}/${_pkgname}/missionpack/.
-
-  # done with this, let's save some disk space.
-  rm -rf ${srcdir}/paks ${srcdir}/${_pkgname}_upstream
+  tar --strip-components=1 -C ${srcdir}/${_pkgname}/ --wildcards -xf upstream.tar.xz spearmint-*-linux/baseq3/* spearmint-*-linux/missionpack/*
+  # done with these, let's save some disk space because these are big and a lot of people run makepkg in /tmp.
+  rm -rf ${srcdir}/ioquake3-q3a-${_ioq3v2}.run ${srcdir}/upstream.tar.xz
 }
 
 build() {
@@ -189,29 +185,23 @@ package() {
 
   ## GAME ##
   cd ${srcdir}/${_pkgname}-game/build/release-linux-${_ARCH}
-  #for i in tools/{lburg,cpp,rcc,etc,asm} baseq3/{,vm,common,ui,game,cgame} missionpack/{,vm,qcommon,q3ui,ui,game,cgame};  # per upstream- only needed for debug
-  for i in {baseq3,missionpack}/vm;
+  # dirs
+  for i in ${_games[@]};
+  do
+    install -d -m 750 ${pkgdir}/opt/${_pkgname}/${i}/vm
+  done
+  # files
+  for g in ${_games[@]};
   do
-    install -d -m 750 ${pkgdir}/opt/spearmint/${i}
+    for f in $(find ${g} -type f -name "*.qvm");
+    do
+      install -m 640 ${f} ${pkgdir}/opt/${_pkgname}/${f}
+    done
   done
-  #for i in baseq3 tools missionpack;  # per upstream- tools is mostly debug, compiler, etc. most people won't need them. if they do, they can just switch this back in.
-  #for i in baseq3 missionpack;
-  #do
-  #  for f in $(find ${i} -type f);
-  #  do
-  #    install -D -m 640 ${f} ${pkgdir}/opt/spearmint/${f}
-  #  done
-  #  for x in $(find ${i} -type f -executable);
-  #  do
-  #    chmod 750 ${pkgdir}/opt/spearmint/${x}
-  #  done
-  #done
-  
-  
 
   ## PATCH ##
   cd ${srcdir}/${_pkgname}-patch
-  for g in ${_games};
+  for g in ${_games[@]};
   do
     for i in $(find ${g} -type d);
     do
diff --git a/ioquake3-q3a-1.32-9.run.sig b/ioquake3-q3a-1.32-9.run.sig
index b9588fb0b29d..fbc07ac38712 100644
--- a/ioquake3-q3a-1.32-9.run.sig
+++ b/ioquake3-q3a-1.32-9.run.sig
diff --git a/spearmint-server.launcher.sig b/spearmint-server.launcher.sig
index ae421d6ba907..43610554aee1 100644
--- a/spearmint-server.launcher.sig
+++ b/spearmint-server.launcher.sig
diff --git a/spearmint.desktop.sig b/spearmint.desktop.sig
index f7a222d0ad35..630338d682ec 100644
--- a/spearmint.desktop.sig
+++ b/spearmint.desktop.sig
diff --git a/spearmint.launcher.sig b/spearmint.launcher.sig
index 636fc9c603d6..126716fb8a4d 100644
--- a/spearmint.launcher.sig
+++ b/spearmint.launcher.sig
diff --git a/spearmint.service.sig b/spearmint.service.sig
index fd4674cf7def..f9a0bf6363c4 100644
--- a/spearmint.service.sig
+++ b/spearmint.service.sig
diff --git a/spearmint.svg.sig b/spearmint.svg.sig
index 6354831b4ad2..dd7d3cfb4ef2 100644
--- a/spearmint.svg.sig
+++ b/spearmint.svg.sig
diff --git a/upstream.tar.xz.sig b/upstream.tar.xz.sig
index 828c6bb664ee..b05db9025fa9 100644
--- a/upstream.tar.xz.sig
+++ b/upstream.tar.xz.sig