hoookay.

7 files changed, 90 insertions, 318 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab2f6033de58..0ab0c37e9f21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sun Nov 19 05:42:40 UTC 2017
+# Sun Nov 19 07:11:34 UTC 2017
 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
+	pkgdesc = An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)
 	pkgver = r4627.232769ac
 	pkgrel = 1
 	url = http://spearmint.pw
@@ -9,42 +9,41 @@ pkgbase = spearmint-git
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	license = custom
 	makedepends = sdl2
+	makedepends = git
 	depends = sdl2
 	optdepends = curl: use native curl
 	optdepends = openal: use native openal
-	optdepends = mumble: support for positional audio (as alternative to in-game VOIP feature)
+	optdepends = mumble: support for positional Mumble VoIP (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 = https://github.com/zturtleman/spearmint/releases/download/release-0.5/spearmint-0.5-data.tar.xz
+	source = git+https://github.com/zturtleman/spearmint.git
 	source = spearmint-engine::git+https://github.com/zturtleman/spearmint.git
 	source = spearmint-game::git+https://github.com/zturtleman/mint-arena.git
 	source = spearmint-patch::git+https://github.com/zturtleman/spearmint-patch-data.git
-	source = https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt
-	source = Makefile.local
+	source = http://ioquake3.org/files/1.36/data/ioquake3-q3a-1.32-9.run
 	source = spearmint.desktop
 	source = spearmint.service
 	source = spearmint.launcher
 	source = spearmint-server.launcher
-	source = http://ioquake3.org/files/1.36/data/ioquake3-q3a-1.32-9.run
-	source = Makefile.local.sig
+	source = spearmint-0.5-data.tar.xz.sig
+	source = ioquake3-q3a-1.32-9.run.sig
 	source = spearmint.desktop.sig
 	source = spearmint.service.sig
 	source = spearmint.launcher.sig
 	source = spearmint-server.launcher.sig
-	source = ioquake3-q3a-1.32-9.run.sig
-	sha512sums = 53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26
+	sha512sums = f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 2ca85a1fc28feaa0f7609d419f5ae81f830e9e9244bccfb8d881f1e44c6151af168bc5cc1e8ebcb1f212d345d34ea967b00763f682c35db720612b0b7162a522
+	sha512sums = 2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b
 	sha512sums = 9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a
 	sha512sums = 84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0
 	sha512sums = 92fb1693b91fc7e7ba97612990369a0344b23dbdcfd0c3ecbfc5e7519f86caf9348b63e9a641f081ef8ba913fb1f50a4ca830a7107bc939be5c345e89223f640
 	sha512sums = 91b9af20e64223d7d7f21e7eb18cac168c9374409358e4e4d7ddad6576ceb68532d67ba82bc525833cd4ae4d8260ea44429299facbfb9186f72f16790f45a023
-	sha512sums = 2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/Makefile.local b/Makefile.local
deleted file mode 100644
index 3ff4fa8f1cd4..000000000000
--- a/Makefile.local
+++ /dev/null
@@ -1,40 +0,0 @@
-PLATFORM=linux
-export PLATFORM
-
-COMPILE_ARCH=%%_ARCH%%
-
-ARCH=%%_ARCH%%
-export ARCH
-
-CROSS_COMPILING=0
-
-export CROSS_COMPILING
-
-# If we want to change the executables' names, dis where we do it
-#ifndef CLIENTBIN
-#CLIENTBIN=spearmint
-#endif
-#ifndef SERVERBIN
-#SERVERBIN=spearmint-server
-#endif
-
-COPYDIR="%%_SRCDIR%%/opt/spearmint"
-
-COPYBINDIR=$(COPYDIR)
-
-TEMPDIR=./tmp
-
-# If we want to use system-supplied libs, we change this to 0.
-# Best to use supplied ones for compatibility with servers, though, I'd think.
-# Plus then I'd have to track them in the makedepends array.
-#USE_INTERNAL_LIBS=1
-#USE_INTERNAL_SPEEX=$(USE_INTERNAL_LIBS)
-#USE_INTERNAL_OGG=$(USE_INTERNAL_LIBS)
-#USE_INTERNAL_VORBIS=$(USE_INTERNAL_LIBS)
-#USE_INTERNAL_OPUS=$(USE_INTERNAL_LIBS)
-#USE_INTERNAL_ZLIB=$(USE_INTERNAL_LIBS)
-#USE_INTERNAL_JPEG=$(USE_INTERNAL_LIBS)
-#USE_INTERNAL_FREETYPE=$(USE_INTERNAL_LIBS)
-#USE_LOCAL_HEADERS=$(USE_INTERNAL_LIBS)
-#USE_RENDERER_DLOPEN=1
-#SERVER_USE_RENDERER_DLOPEN=0
diff --git a/Makefile.local.sig b/Makefile.local.sig
deleted file mode 100644
index ca8b53d2ae16..000000000000
--- a/Makefile.local.sig
+++ /dev/null
diff --git a/PKGBUILD b/PKGBUILD
index 5b5870501748..b7dbf1ad91c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,60 +9,49 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 pkgname=spearmint-git
 _pkgname=spearmint
 pkgver=r4627.232769ac
+_upver=r4627.232769ac
 pkgrel=1
 _ioq3v1='1.36'
 _ioq3v2='1.32-9'
-_upver='0.2'  # upstream release- needed for some pk3's.
-
-## What games do you want to build in support for?
-## baseq3 should at the LEAST be enabled.
-## See https://github.com/zturtleman/spearmint-patch-data.git
-## and https://github.com/zturtleman/spearmint/wiki ("Engine Feature Support").
-## "missionpack" is Q3:Team Arena
-_games=("baseq3"
-	"missionpack")
-
-pkgdesc="An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)-git master:HEAD"
-url="http://spearmint.pw"
-license=("GPL3")
+_upver='0.5'
+pkgdesc="An ioquake3-based engine with multiple improvements (note: requires pak files from original Q3 CD; incompatible with ioquake3)"
+url="http://${_pkgname}.pw"
+license=("GPL3" "custom")
 arch=('i686' 'x86_64')
 depends=('sdl2')
+makedepends=('sdl2' 'git')
 optdepends=('curl: use native curl'
 	    'openal: use native openal'
-	    'mumble: support for positional audio (as alternative to in-game VOIP feature)')
-makedepends=('sdl2')
-conflicts=('spearmint')
-provides=('spearmint')
-install=spearmint.install
-source=("upstream.tar.xz::https://github.com/zturtleman/${_pkgname}/releases/download/release-${_upver}/${_pkgname}-${_upver}-linux.tar.xz"
-	"${_pkgname}-engine::git+https://github.com/zturtleman/spearmint.git"
+	    'mumble: support for positional Mumble VoIP (as alternative to in-game VoIP feature)')
+conflicts=("${_pkgname}")
+provides=("${_pkgname}")
+install=${_pkgname}.install
+source=("https://github.com/zturtleman/${_pkgname}/releases/download/release-${_upver}/${_pkgname}-${_upver}-data.tar.xz"
+	"git+https://github.com/zturtleman/${_pkgname}.git"
+	"${_pkgname}-engine::git+https://github.com/zturtleman/${_pkgname}.git"
 	"${_pkgname}-game::git+https://github.com/zturtleman/mint-arena.git"
-	"${_pkgname}-patch::git+https://github.com/zturtleman/spearmint-patch-data.git"
-	"https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt"
-	"Makefile.local"
-	"spearmint.desktop"
-	"spearmint.service"
-	"spearmint.launcher"
-	"spearmint-server.launcher"
+	"${_pkgname}-patch::git+https://github.com/zturtleman/${_pkgname}-patch-data.git"
 	"http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run"
-	"Makefile.local.sig"
-	"spearmint.desktop.sig"
-	"spearmint.service.sig"
-	"spearmint.launcher.sig"
-	"spearmint-server.launcher.sig"
-	"ioquake3-q3a-${_ioq3v2}.run.sig")
-noextract=("upstream.tar.xz")
-sha512sums=('53a3b3b2bb139b9e5ecbd12c5876048dd2b2cffab07acf2db5fd7697f5624af24d503539bfe4a9acf721fdb6886063ff24d848637781f6639550e79f4a1abd26'
+	"${_pkgname}.desktop"
+	"${_pkgname}.service"
+	"${_pkgname}.launcher"
+	"${_pkgname}-server.launcher"
+	"${_pkgname}-${_upver}-data.tar.xz.sig"
+	"ioquake3-q3a-${_ioq3v2}.run.sig"
+	"${_pkgname}.desktop.sig"
+	"${_pkgname}.service.sig"
+	"${_pkgname}.launcher.sig"
+	"${_pkgname}-server.launcher.sig")
+sha512sums=('f2c9746fcfd69efed2e9a3c7ba3f1f4a5d7f90352d5355dada6bf27b8c4a64975d65de19e66da548df1bcb6f38d2ae9524ffb869fa2fcd0da33c2fa533969fab'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '2ca85a1fc28feaa0f7609d419f5ae81f830e9e9244bccfb8d881f1e44c6151af168bc5cc1e8ebcb1f212d345d34ea967b00763f682c35db720612b0b7162a522'
+            '2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b'
             '9e70a201f26265e29fb9ce2d198d943de8e12094b9d04b5e2fad630508787f036c0ee318604a2899ad4a74b4cef8ba3bffd1e7817de8bcbd512a6f80783aea1a'
             '84c60900e2db08e2e8dc39236d268fea392fcbc7cb51af051b5981301bfd5d6c10cafd29284096728048ed4b54baa580ee3f9824a2a1435ba42e91d644547cc0'
             '92fb1693b91fc7e7ba97612990369a0344b23dbdcfd0c3ecbfc5e7519f86caf9348b63e9a641f081ef8ba913fb1f50a4ca830a7107bc939be5c345e89223f640'
             '91b9af20e64223d7d7f21e7eb18cac168c9374409358e4e4d7ddad6576ceb68532d67ba82bc525833cd4ae4d8260ea44429299facbfb9186f72f16790f45a023'
-            '2ff6eff394119697b1c0a76f9c6d70cec21f90aecd89b72f6459661d04821a799a9c70d80f390b2ae7822d5830e247033a79022cd6d3d1754f7780fadd2d418b'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -74,84 +63,34 @@ pkgver() {
   cd "${srcdir}/${_pkgname}-engine"
   (
      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  #( set -o pipefail
-  #  git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-  #  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  #)
   )
 }
 
 prepare() {
-
-  if [[ "${CARCH}" == 'i686' ]];
-  then
-    _ARCH='x86'
-    _MKARCH='i86pc'
-  elif [[ "${CARCH}" == 'x86_64' ]];
-  then
-    _ARCH=${CARCH}
-    _MKARCH='amd64'
-  fi
-
-  # soooo $pkgdir, if i recall correctly, isn't available in prepare(). which is kind of stoopit.
-  # so i guess we cross our fingers.
-  sed -i \
-	-e "s@%%_MKARCH%%@${_MKARCH}@g" \
-	-e "s@%%_ARCH%%@${_ARCH}@g" \
-	-e "s@%%_SRCDIR%%@${pkgdir}@g" ${srcdir}/Makefile.local
-
-  cp ${srcdir}/Makefile.local ${srcdir}/${_pkgname}-engine/.
-  cp ${srcdir}/Makefile.local ${srcdir}/${_pkgname}-game/.
-  mkdir -p ${srcdir}/${_pkgname}-{engine,game}/tmp
-
-  ## Extra .pk3 files needed
-  # Demo/ioq3
+  # Quake 3 point release pk3s
   cd ${srcdir}
+  mkdir -p paks
   chmod 700 ioquake3-q3a-${_ioq3v2}.run
-  install -d -m 750 ${srcdir}/${_pkgname}/{baseq3,missionpack}
-  ./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
+  ./ioquake3-q3a-${_ioq3v2}.run --tar xfC ${srcdir}/paks/.
+  for d in baseq3 missionpack;
+  do
+    mkdir -p ${srcdir}/q3a/${d}
+  done
+  tar -C ${srcdir}/q3a/baseq3 -xf ${srcdir}/paks/idpatchpk3s.tar
+  tar -C ${srcdir}/q3a/missionpack -xf ${srcdir}/paks/idtapatchpk3s.tar
   cd ${srcdir}
-  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
+  # don't need this anymore.
+  rm -rf ${srcdir}/paks
 }
 
 build() {
-
-  if [[ "${CARCH}" == 'i686' ]];
-  then
-    _ARCH='x86'
-  elif [[ "${CARCH}" == 'x86_64' ]];
-  then
-    _ARCH=${CARCH}
-  fi
-
-  ## ENGINE ##
-  cd ${srcdir}/${_pkgname}-engine
+  cd ${srcdir}/${_pkgname}
   make
 
-  cd build/release-linux-${_ARCH}
-  if [ ! -f "${_pkgname}-server" ];
-  then
-    if [[ "${CARCH}" == 'i686' ]];
-    then
-      rm -f ${_pkgname}{,-server}_x86_64
-    elif [[ "${CARCH}" == 'x86_64' ]];
-    then
-      rm -rf ${_pkgname}{,-server}_x86
-    fi
-  fi
-
-
-  ## GAME ##
   cd ${srcdir}/${_pkgname}-game
-  make
-
-  ## PATCH ##
-  # does not require any building.
-
+  make BUILD_GAME_SO=0 # baseq3, missionpack
+  make BUILD_GAME_SO=0 BASEGAME=demoq3 MISSIONPACK=tademo
+  make BUILD_GAME_SO=0 BASEGAME=baseoa MISSIONPACK=missionpackoa
 }
 
 package() {
@@ -163,72 +102,51 @@ package() {
     _ARCH=${CARCH}
   fi
 
-  ## Base dirs ##
+  # Base dirs
   install -d -m 755 ${pkgdir}/usr/bin
   install -d -m 755 ${pkgdir}/usr/share/doc/${_pkgname}
-  install -d -m 750 ${pkgdir}/opt/spearmint/{baseq3,missionpack}
-
-  ## ENGINE ##
-  install -m 750 ${srcdir}/${_pkgname}-engine/build/release-linux-${_ARCH}/${_pkgname}_${_ARCH} ${pkgdir}/opt/spearmint/${_pkgname}
-  install -m 750 ${srcdir}/${_pkgname}-engine/build/release-linux-${_ARCH}/${_pkgname}-server_${_ARCH} ${pkgdir}/opt/spearmint/${_pkgname}-server
-  install -m 750 ${srcdir}/${_pkgname}-engine/build/release-linux-${_ARCH}/${_pkgname}-renderer-opengl1_${_ARCH}.so ${pkgdir}/opt/spearmint/
-  install -m 750 ${srcdir}/${_pkgname}-engine/build/release-linux-${_ARCH}/${_pkgname}-renderer-opengl2_${_ARCH}.so ${pkgdir}/opt/spearmint/
-  # docs
-  install -m 644 ${srcdir}/${_pkgname}-engine/id-readme.txt ${pkgdir}/usr/share/doc/${_pkgname}/
-  install -m 644 ${srcdir}/${_pkgname}-engine/md4-readme.txt ${pkgdir}/usr/share/doc/${_pkgname}/
-  install -m 644 ${srcdir}/${_pkgname}-engine/opengl2-readme.md ${pkgdir}/usr/share/doc/${_pkgname}/
-  install -m 644 ${srcdir}/${_pkgname}-engine/README.md ${pkgdir}/usr/share/doc/${_pkgname}/README.engine
-  install -m 644 ${srcdir}/${_pkgname}-engine/voip-readme.txt ${pkgdir}/usr/share/doc/${_pkgname}/
-  # icons, etc.
-  for i in ${srcdir}/${_pkgname}-engine/misc/*.{svg,png,ico};
-  do
-    install -D -m 644 ${i} ${pkgdir}/usr/share/pixmaps/$(basename ${i})
-  done
-
-  ## GAME ##
-  cd ${srcdir}/${_pkgname}-game/build/release-linux-${_ARCH}
-  # dirs
-  for i in ${_games[@]};
-  do
-    install -d -m 750 ${pkgdir}/opt/${_pkgname}/${i}/vm
-  done
-  # files
-  for g in ${_games[@]};
+  install -d -m 755 ${pkgdir}/usr/share/${_pkgname}
+  install -d -m 750 ${pkgdir}/opt/${_pkgname}
+
+  # stuff i wrote
+  install -m 750 ${srcdir}/${_pkgname}.launcher ${pkgdir}/opt/${_pkgname}/
+  install -m 750 ${srcdir}/${_pkgname}-server.launcher ${pkgdir}/opt/${_pkgname}/
+
+  # 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-${_upver}/${_pkgname}-${_upver}-data.tar.xz
+  install -m 640 ${srcdir}/${_pkgname}-${_upver}-data/gamecontrollerdb.txt ${pkgdir}/opt/${_pkgname}/
+  install -m 640 ${srcdir}/${_pkgname}-patch/${_pkgname}-gamelist.txt ${pkgdir}/opt/${_pkgname}/
+  install -D -m 644 ${srcdir}/${_pkgname}-patch/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
-    for f in $(find ${g} -type f -name "*.qvm");
-    do
-      install -m 640 ${f} ${pkgdir}/opt/${_pkgname}/${f}
-    done
+  	install -d -m 750 ${pkgdir}/opt/${_pkgname}/${d}
+	install -m 640 ${srcdir}/${_pkgname}-${_upver}-data/${d}/* ${pkgdir}/opt/${_pkgname}/${d}/
   done
 
-  ## PATCH ##
-  cd ${srcdir}/${_pkgname}-patch
-  for g in ${_games[@]};
+  # http://ioquake3.org/files/${_ioq3v1}/data/ioquake3-q3a-${_ioq3v2}.run
+  for d in baseq3 missionpack;
   do
-    for i in $(find ${g} -type d);
-    do
-      install -d -m 750 ${pkgdir}/opt/spearmint/${i}
-    done
-    for i in $(find ${g} -type f);
-    do
-      # per upstream: these should be "loose", not zipped in a pk3. otherwise, version conflicts from clients and other nastiness.
-      install -D -m 640 ${srcdir}/${_pkgname}-patch/${i} ${pkgdir}/opt/spearmint/${i}
-    done
+	install -m 640 ${srcdir}/q3a/${d}/pak?.pk3 ${pkgdir}/opt/${_pkgname}/${d}/
   done
 
-  # PK3 PAKs from demo and upstream
-  install -m 640 ${srcdir}/${_pkgname}/baseq3/* ${pkgdir}/opt/spearmint/baseq3/
-  install -m 640 ${srcdir}/${_pkgname}/missionpack/* ${pkgdir}/opt/spearmint/missionpack/
-
   cd ${pkgdir}/usr/bin
-  ln -sf /opt/spearmint/${_pkgname}.launcher ${_pkgname}
-  ln -sf /opt/spearmint/${_pkgname}-server.launcher ${_pkgname}-server
-  ln -sf /opt/spearmint/${_pkgname}.launcher spearmint 
-
-  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 -m 750 ${srcdir}/${_pkgname}.launcher ${pkgdir}/opt/spearmint/
-  install -m 750 ${srcdir}/${_pkgname}-server.launcher ${pkgdir}/opt/spearmint/
-  install -m 640 ${srcdir}/gamecontrollerdb.txt ${pkgdir}/opt/spearmint/
+  ln -sf /opt/${_pkgname}/${_pkgname}.launcher ${_pkgname}
+  ln -sf /opt/${_pkgname}/${_pkgname}-server.launcher ${_pkgname}-server
+
+  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}
+  install -m 644 ${srcdir}/${_pkgname}-engine/misc/${_pkgname}_text.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+  mv ${srcdir}/${_pkgname}-engine/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 '{}' \;
 
 }
diff --git a/spearmint.svg b/spearmint.svg
deleted file mode 100644
index 470c840ee01f..000000000000
--- a/spearmint.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="1024"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="spearmint_icon.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3025-7"
-       id="linearGradient3031-4"
-       x1="188.57143"
-       y1="688.07648"
-       x2="987.14288"
-       y2="168.07646"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59873694,0,0,0.59873694,297.37016,143.09113)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3025-7">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1;"
-         offset="0"
-         id="stop3027-7" />
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:0;"
-         offset="1"
-         id="stop3029-3" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7"
-     inkscape:cx="782.76749"
-     inkscape:cy="513.52888"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="993"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-28.362183)">
-    <rect
-       style="fill:#eeeeec;fill-opacity:1;stroke:#2e3436;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect3178"
-       width="997.64111"
-       height="997.64111"
-       x="13.179454"
-       y="41.541637"
-       ry="263.64294" />
-    <path
-       style="fill:#4e9a06;fill-opacity:1;stroke:#2e3436;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       d="M 512 13.1875 L 512 512 L 1010.8125 512 L 1010.8125 276.8125 C 1010.8125 130.75431 893.24569 13.1875 747.1875 13.1875 L 512 13.1875 z M 512 512 L 13.1875 512 L 13.1875 747.1875 C 13.1875 893.24569 130.75431 1010.8125 276.8125 1010.8125 L 512 1010.8125 L 512 512 z "
-       transform="translate(0,28.362183)"
-       id="rect3178-4" />
-    <g
-       inkscape:label="Layer 1"
-       id="layer1-5"
-       transform="matrix(4.5778762,0,0,4.5778762,455.12887,-9.0510728)"
-       style="fill:#73d216">
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path4262"
-         d="m 25.957183,41.594163 c -7.740369,-12.20204 2.972126,-23.314574 14.138351,-16.97324 9.804333,5.351421 31.806208,22.766039 43.985891,36.91104 l 22.306005,5.399724 7.58532,12.727922 c -7.02745,-0.72793 -10.15493,-0.7291 -16.021917,-1.216798 5.554077,12.062425 -5.841501,23.284359 -20.297652,17.801666 l 0.25713,17.741953 -9.513801,-6.81394 -9.77093,-25.712973 C 46.58443,69.207581 29.551735,47.593492 25.957183,41.594163 z"
-         style="fill:#73d216;fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-</svg>
diff --git a/spearmint.svg.sig b/spearmint.svg.sig
deleted file mode 100644
index dd7d3cfb4ef2..000000000000
--- a/spearmint.svg.sig
+++ /dev/null
diff --git a/upstream.tar.xz.sig b/upstream.tar.xz.sig
deleted file mode 100644
index b05db9025fa9..000000000000
--- a/upstream.tar.xz.sig
+++ /dev/null