holyspirit-svn: fix compilation + permissions

git-svn-id: http://svn.kraehen.org/aur@146 04e22907-73ef-438a-a52f-a971dc6d3b47

3 files changed, 43 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34ad16a58095..fc26ebf26978 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = holyspirit-svn
 	pkgdesc = Diablo clone
-	pkgver = 2357
+	pkgver = 2381
 	pkgrel = 1
 	url = http://www.holyspirit.fr/
 	install = holyspirit.install
@@ -8,11 +8,16 @@ pkgbase = holyspirit-svn
 	arch = x86_64
 	license = GPL
 	makedepends = subversion
+	makedepends = cmake
+	makedepends = qtwebkit
 	depends = sfml
+	optdepends = qtwebkit: for the launcher
 	provides = holyspirit
 	conflicts = holyspirit
+	backup = opt/share/games/holyspirit/configuration.conf
+	backup = opt/share/games/holyspirit/key_mapping.conf
 	source = holyspirit.sh
-	md5sums = d78610c419dc689d41c2e85ce72516d4
+	md5sums = c2fa4f8768d35c54a95dec924e50c75f
 
 pkgname = holyspirit-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 986bd2997d41..28c7fee853d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,21 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Johannes Dewender arch at JonnyJD dot net
 pkgname=holyspirit-svn
-pkgver=2357
+pkgver=2381
 pkgrel=1
 pkgdesc="Diablo clone"
 arch=(i686 x86_64)
 url="http://www.holyspirit.fr/"
 license=('GPL')
 depends=('sfml')
-makedepends=('subversion')
+makedepends=('subversion' 'cmake' 'qtwebkit')
+optdepends=('qtwebkit: for the launcher')
 provides=('holyspirit')
 conflicts=('holyspirit')
 install=holyspirit.install
 source=(holyspirit.sh)
-md5sums=('d78610c419dc689d41c2e85ce72516d4')
+backup=('opt/share/games/holyspirit/configuration.conf' 'opt/share/games/holyspirit/key_mapping.conf')
+md5sums=('c2fa4f8768d35c54a95dec924e50c75f')
 
 _svntrunk=https://lechemindeladam.svn.sourceforge.net/svnroot/lechemindeladam/trunk
 _svnmod=holyspirit
@@ -34,22 +37,40 @@ build() {
   cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
   cd "$srcdir/$_svnmod-build"
 
-  cd Source
-  mkdir build && cd build
-  cmake -DSFML_STATIC_LIBRARIES=FALSE ..
+  cmake -DSFML_STATIC_LIBRARIES=FALSE \
+    -DCMAKE_INSTALL_PREFIX:STRING="$pkgdir/opt"
+
+  msg "Building holyspirit..."
   make
+
+  msg "Building the launcher..."
+  cd Launcher
+  sed -i -e 's|/usr/share/qt4|/usr/share/qt|g' Makefile
+  sed -i -e 's|/usr/bin/moc-qt4|/usr/bin/moc|g' Makefile
+  make INCPATH="-I/usr/share/qt/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtWebKit -I/usr/include/Qt -I. -I."
 }
 
 package() {
   cd "$srcdir/$_svnmod-build"
 
-  mv Source/build/Holyspirit .
-  mkdir -p $pkgdir/opt/holyspirit
-  cp -r * $pkgdir/opt/holyspirit/
-  
-  install -Dm755 $srcdir/holyspirit.sh $pkgdir/usr/bin/holyspirit
+  sed -i -e "s|$pkgdir||g" holyspirit.ini
+  cp ../LauncherHolyspirit .
+  make install
+
+  # fix currently broken upstream installation
+  mv "$pkgdir/opt/games/"* "$pkgdir/opt/share/games/holyspirit/"
+  rm -r "$pkgdir/opt/games"
+
+  # desktop icon can be installed in /usr
+  mkdir -p "$pkgdir/usr/share"
+  mv "$pkgdir/opt/share/applications" "$pkgdir/usr/share/applications"
+  mv "$pkgdir/opt/share/icons" "$pkgdir/usr/share/icons"
+
+  # make savegames, config and temp dirs writable
+  chown -R root:games "$pkgdir/opt/share/games/holyspirit/"{Data/User,{configuration,key_mapping}.conf}
+  chmod -R g+w "$pkgdir/opt/share/games/holyspirit/"{Data/User,{configuration,key_mapping}.conf}
 
-  chown -R root:games $pkgdir/opt/holyspirit
+  install -D "$srcdir/holyspirit.sh" "$pkgdir/usr/bin/holyspirit"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/holyspirit.sh b/holyspirit.sh
index edd1ea2ac950..9ee0a060e488 100644
--- a/holyspirit.sh
+++ b/holyspirit.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
-cd /opt/holyspirit
-./Holyspirit $@
+cd /opt/share/games/holyspirit
+exec ./Holyspirit $@