updated to v18.1

4 files changed, 54 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53b250d6f702..ddb4b63c6bda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 # Generated by mksrcinfo v8
-# Wed Feb 17 02:31:00 UTC 2016
+# Mon Mar 21 18:15:51 UTC 2016
 pkgbase = infra-arcana
 	pkgdesc = Roguelike game inspired by H.P. Lovecraft
-	pkgver = 18.0
+	pkgver = 18.1
 	pkgrel = 1
 	url = https://sites.google.com/site/infraarcana/home
+	install = infra-arcana.install
 	arch = i686
 	arch = x86_64
 	license = custom:Infra Arcana License
 	depends = sdl2_image
 	depends = sdl2_mixer
-	source = https://github.com/InfraArcana/ia/archive/v18.0.zip
+	depends = hicolor-icon-theme
+	source = https://github.com/InfraArcana/ia/archive/v18.1.zip
+	source = infra-arcana.install
 	source = infra-arcana.sh
-	md5sums = 7e72cb038257d07e03a6583930971d4e
+	md5sums = fc6561591d30b7af0d86390ee547bd4a
+	md5sums = 16afb02e73700171bb2b88e03ef9a5ea
 	md5sums = 87294b81f5a2f98a78d318a5dcec7caf
 
 pkgname = infra-arcana
diff --git a/PKGBUILD b/PKGBUILD
index e908ab778c76..289548904561 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: metamer <metamer at openmailbox dot org>
 pkgname=infra-arcana
-pkgver=18.0
+pkgver=18.1
 pkgrel=1
 epoch=
 pkgdesc="Roguelike game inspired by H.P. Lovecraft"
@@ -8,14 +8,16 @@ arch=('i686' 'x86_64')
 url="https://sites.google.com/site/infraarcana/home"
 license=('custom:Infra Arcana License')
 groups=()
-depends=('sdl2_image' 'sdl2_mixer')
+depends=('sdl2_image' 'sdl2_mixer' 'hicolor-icon-theme')
 #checkdepends=('valgrind')
 backup=()
 options=()
-install=
+install=${pkgname}.install
 source=("https://github.com/InfraArcana/ia/archive/v${pkgver}.zip"
+		"${pkgname}.install"
 		"${pkgname}.sh")
-md5sums=('7e72cb038257d07e03a6583930971d4e'
+md5sums=('fc6561591d30b7af0d86390ee547bd4a'
+         '16afb02e73700171bb2b88e03ef9a5ea'
          '87294b81f5a2f98a78d318a5dcec7caf')
 
 build() {
@@ -25,15 +27,34 @@ build() {
 
 package() {
 	cd "ia-$pkgver"
-
-	install -DTm644 "target/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-
+        #install licenses
+	install -DTm644 "target/license.txt"\
+          "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+	install -DTm644 "target/images/SPECIAL_ELITE_License.txt" \
+          "${pkgdir}/usr/share/licenses/${pkgname}/SPECIAL_ELITE_License.txt"
+        #install docs
+	install -DTm644 "target/contact.txt" \
+          "${pkgdir}/usr/share/doc/${pkgname}/contact.txt"
+	install -DTm644 "target/credits.txt" \
+          "${pkgdir}/usr/share/doc/${pkgname}/credits.txt"
+	install -DTm644 "target/manual.txt" \
+          "${pkgdir}/usr/share/doc/${pkgname}/manual.txt"
+	install -DTm644 "target/release_history.txt" \
+          "${pkgdir}/usr/share/doc/${pkgname}/release_history.txt"
+        #make dir for save game storage
+        mkdir -p "${pkgdir}/var/lib"
+        install -dm775 -g games "${pkgdir}/var/lib/${pkgname}"
+        install -dm775 -g games "${pkgdir}/var/lib/${pkgname}/data"
+        #move target
 	mkdir -p "${pkgdir}/opt/${pkgname}/"
 	cp -R target/* "${pkgdir}/opt/${pkgname}/"
-	# required to allow users to write saved games and high scores to data
-	chmod -R a+w "${pkgdir}/opt/${pkgname}/data"
-
-	# this shell script is required as the compiled binary relies on relative references
-	install -Dm755 "../${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-
+        #link savegame folder
+	rm -rf  "${pkgdir}/opt/${pkgname}/data"
+        ln -s "/var/lib/${pkgname}/data" "${pkgdir}/opt/${pkgname}"
+        # this shell script is required as the compiled binary relies on
+        # relative references
+        install -Dm755 "../${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+        #install icon
+        install -Dm644 "icon/icon.ico" \
+          "$pkgdir/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
 }
diff --git a/infra-arcana-functionalinclude.diff b/infra-arcana-functionalinclude.diff
deleted file mode 100644
index e7bd2fe9b848..000000000000
--- a/infra-arcana-functionalinclude.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur infra-arcana-17.0.old/ia-17.0/include/FeatureData.h infra-arcana-17.0/ia-17.0/include/FeatureData.h
---- infra-arcana-17.0.old/ia-17.0/include/FeatureData.h	2015-02-18 14:24:13.000000000 -0500
-+++ infra-arcana-17.0/ia-17.0/include/FeatureData.h	2015-08-25 20:49:42.863365705 -0400
-@@ -1,6 +1,8 @@
- #ifndef FEATURE_DATA_H
- #define FEATURE_DATA_H
- 
-+#include <functional>
-+
- #include "Art.h"
- #include "CmnData.h"
- #include "Room.h"
diff --git a/infra-arcana.install b/infra-arcana.install
new file mode 100644
index 000000000000..abe5df3c9a5b
--- /dev/null
+++ b/infra-arcana.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  echo 'Installed. Run infra-arcana to launch.'
+  echo 'You will have to be a member of the games group to be able to save'
+  echo 'Saved games and other game data are located in /var/lib/infra-arcana/data'
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et: