updated to v20.0

3 files changed, 28 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26386e8c9c34..e413a3b4c769 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Jan 10 10:58:38 UTC 2018
 pkgbase = infra-arcana
 	pkgdesc = Roguelike game inspired by H.P. Lovecraft
-	pkgver = 19.2
-	pkgrel = 1
+	pkgver = 20.0
+	pkgrel = 0
 	url = https://sites.google.com/site/infraarcana/home
 	install = infra-arcana.install
 	arch = i686
@@ -13,12 +11,12 @@ pkgbase = infra-arcana
 	depends = sdl2_image
 	depends = sdl2_mixer
 	depends = hicolor-icon-theme
-	source = git+https://github.com/martin-tornqvist/ia.git#tag=v19.2
+	source = git+https://gitlab.com/martin-tornqvist/ia.git#tag=v20.0
 	source = infra-arcana.install
 	source = infra-arcana.desktop
 	source = infra-arcana.sh
 	md5sums = SKIP
-	md5sums = 2bc0fb64e8593e25009b1dc50e642cd8
+	md5sums = 7c9b6d90f53be077e6f6c93b251f64ba
 	md5sums = 2e28c2803d7d2cd4376dcd3aa6512774
 	md5sums = 87294b81f5a2f98a78d318a5dcec7caf
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f35b0fd74eb..36f976083cc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-#Maintainer: metamer <metamer at openmailbox dot org>
+#Maintainer: paskali <paskali2005 at gmail dot com>
 pkgname=infra-arcana
-pkgver=19.2
-pkgrel=1
+pkgver=20.0
+pkgrel=0
 epoch=
 pkgdesc="Roguelike game inspired by H.P. Lovecraft"
 arch=('i686' 'x86_64')
@@ -10,61 +10,54 @@ license=('custom:Infra Arcana License')
 groups=()
 makedepends=(cmake)
 depends=('sdl2_image' 'sdl2_mixer' 'hicolor-icon-theme')
-#checkdepends=('valgrind')
-backup=()
-options=()
+conflicst=('infra-arcana-git')
+
 install=${pkgname}.install
-source=( git+"https://github.com/martin-tornqvist/ia.git"#"tag=v${pkgver}"
+source=( "git+https://gitlab.com/martin-tornqvist/ia.git#tag=v""$pkgver"
 		"${pkgname}.install"
 		"${pkgname}.desktop"
 		"${pkgname}.sh")
 md5sums=('SKIP'
-         '2bc0fb64e8593e25009b1dc50e642cd8'
+         '7c9b6d90f53be077e6f6c93b251f64ba'
          '2e28c2803d7d2cd4376dcd3aa6512774'
          '87294b81f5a2f98a78d318a5dcec7caf')
 
 prepare(){
-	cd $srcdir/"ia"
-	git submodule init
-	git submodule update
+	cd $srcdir/ia
 }
 
 build() {
 	cd $srcdir/"ia"
 	mkdir -p build && cd build
 	cmake ..
-	make
+	make ia
 }
 
 package() {
 	cd "ia"
         #install licenses
-	install -DTm644 "build/res/license.txt"\
-          "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-	install -DTm644 "build/res/images/SPECIAL_ELITE_License.txt" \
+	install -DTm644 "build/LICENSE.txt"\
+          "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+	install -DTm644 "build/gfx/fonts/SPECIAL_ELITE_License.txt" \
           "${pkgdir}/usr/share/licenses/${pkgname}/SPECIAL_ELITE_License.txt"
+        install -DTm644 "build/README-AUDIO-FILES.txt"\
+          "${pkgdir}/usr/share/licenses/${pkgname}/README-AUDIO-FILES.txt"
         #install docs
-	install -DTm644 "build/res/contact.txt" \
+	install -DTm644 "build/contact.txt" \
           "${pkgdir}/usr/share/doc/${pkgname}/contact.txt"
-	install -DTm644 "build/res/credits.txt" \
+	install -DTm644 "build/credits.txt" \
           "${pkgdir}/usr/share/doc/${pkgname}/credits.txt"
-	install -DTm644 "build/res/manual.txt" \
+	install -DTm644 "build/manual.txt" \
           "${pkgdir}/usr/share/doc/${pkgname}/manual.txt"
-	install -DTm644 "build/res/release_history.txt" \
+	install -DTm644 "build/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 res
-	mkdir -p "${pkgdir}/opt/${pkgname}/"
-	cp -R build/res "${pkgdir}/opt/${pkgname}/"
+	# copy data
+        mkdir -p "${pkgdir}/opt/${pkgname}/"
+        cp -R build/audio "${pkgdir}/opt/${pkgname}/"
+        cp -R build/data "${pkgdir}/opt/${pkgname}/"
+        cp -R build/gfx "${pkgdir}/opt/${pkgname}/"
 	# copy main binary
 	cp build/ia "${pkgdir}/opt/${pkgname}/"
-        # move data files to user-accessible folder link savegame folder
-	cp -R build/res/data/map "${pkgdir}/var/lib/${pkgname}/data"
-	rm -rf  "${pkgdir}/opt/${pkgname}/res/data"
-        ln -s "/var/lib/${pkgname}/data" "${pkgdir}/opt/${pkgname}/res"
         # this shell script is required as the compiled binary relies on
         # relative references
         install -Dm755 "../${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
diff --git a/infra-arcana.install b/infra-arcana.install
index fd4411f891e1..dc4dec973fc5 100644
--- a/infra-arcana.install
+++ b/infra-arcana.install
@@ -1,8 +1,6 @@
 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() {
@@ -10,7 +8,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  echo 'To remove application data such as saved games, delete /var/lib/infra-arcana'
+  echo 'To remove application data such as saved games, delete ~/.local/share/infra_arcana'
 }
 
 # vim:set ts=2 sw=2 et: