[upd] 0.1→0.2

3 files changed, 37 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 661ad9af2a1a..3038b653878b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = freeablo
 	pkgdesc = Modern, FLOSS reimplementation of the Diablo 1 game engine
-	pkgver = 0.1
-	pkgrel = 2
+	pkgver = 0.2
+	pkgrel = 1
 	url = http://freeablo.org/
+	install = freeablo.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = sdl2
+	depends = sdl2_image
+	depends = sdl2_mixer
 	depends = boost-libs
-	source = freeablo-0.1.tar.gz::https://github.com/wheybags/freeablo/archive/cdv0.1.tar.gz
-	source = stormlib-for-0.1.tar.gz::https://github.com/wheybags/StormLib/archive/0857abc78c1d4bb924dc885781ca788cf64757a7.zip
-	sha256sums = ae9c023d296f9152cb14bf9973c367fb03a9138d636edf3d38e3c79785a6b04c
-	sha256sums = 5c47d6674354357680f6b296f0ac768846142b358a1949b58591c304737b11ce
+	depends = librocket
+	source = freeablo-0.2.tar.gz::https://github.com/wheybags/freeablo/archive/v0.2.tar.gz
+	source = stormlib-for-0.2.tar.gz::https://github.com/wheybags/StormLib/archive/5da7bbb379e99014fbb9a2de5a43daf1483bb201.zip
+	sha256sums = 0a5315a68403a5931e970cb6eae9ba07f004c1050a22579c20653835e55ebeb4
+	sha256sums = 59154b9748071802eb2e19ab6f694c8841f7681843a7b648dfc3d024729d048c
 
 pkgname = freeablo
 
diff --git a/PKGBUILD b/PKGBUILD
index c6eea4c927d7..cd46207c9d04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,33 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=freeablo
-pkgver=0.1
-pkgrel=2
+pkgver=0.2
+pkgrel=1
 pkgdesc='Modern, FLOSS reimplementation of the Diablo 1 game engine'
 arch=('i686' 'x86_64')
 url="http://freeablo.org/"
 license=('GPL3')
-depends=('sdl2' 'boost-libs')
+depends=('sdl2_image' 'sdl2_mixer' 'boost-libs' 'librocket')
 makedepends=('cmake')
-source=(freeablo-$pkgver.tar.gz::"https://github.com/wheybags/freeablo/archive/cdv$pkgver.tar.gz"
-        stormlib-for-$pkgver.tar.gz::"https://github.com/wheybags/StormLib/archive/0857abc78c1d4bb924dc885781ca788cf64757a7.zip")
-sha256sums=('ae9c023d296f9152cb14bf9973c367fb03a9138d636edf3d38e3c79785a6b04c'
-            '5c47d6674354357680f6b296f0ac768846142b358a1949b58591c304737b11ce')
+install=$pkgname.install
+source=(freeablo-$pkgver.tar.gz::"https://github.com/wheybags/freeablo/archive/v$pkgver.tar.gz"
+        stormlib-for-$pkgver.tar.gz::"https://github.com/wheybags/StormLib/archive/5da7bbb379e99014fbb9a2de5a43daf1483bb201.zip")
+sha256sums=('0a5315a68403a5931e970cb6eae9ba07f004c1050a22579c20653835e55ebeb4'
+            '59154b9748071802eb2e19ab6f694c8841f7681843a7b648dfc3d024729d048c')
 
 prepare() {
   # copy submodule to right location
-  cp -rup StormLib-0857abc78c1d4bb924dc885781ca788cf64757a7/* $pkgname-cdv$pkgver/extern/StormLib
+  cp -rup StormLib-5da7bbb379e99014fbb9a2de5a43daf1483bb201/* $pkgname-$pkgver/extern/StormLib
 
   # reset build folder
   rm -rf build
   mkdir build
-
-  # patch resources directory location
-  sed 's|"resources/|"/usr/share/freeablo/resources/|' -i \
-    freeablo-cdv$pkgver/apps/freeablo/falevelgen/levelgen.cpp \
-    freeablo-cdv$pkgver/components/diabloexe/diabloexe.cpp
 }
 
 build() {
   cd build
 
-  cmake ../$pkgname-cdv$pkgver
+  cmake ../$pkgname-$pkgver
   make
 }
 
@@ -43,7 +39,7 @@ package() {
   done
   # data
   install -d "$pkgdir"/usr/share/freeablo
-  cp -r freeablo-cdv$pkgver/resources "$pkgdir"/usr/share/freeablo
+  cp -r freeablo-$pkgver/resources "$pkgdir"/usr/share/freeablo
   # doc
-  install -Dm644 freeablo-cdv$pkgver/readme.md "$pkgdir"/usr/share/doc/freeablo/readme.md
+  install -Dm644 freeablo-$pkgver/readme.md "$pkgdir"/usr/share/doc/freeablo/readme.md
 }
diff --git a/freeablo.install b/freeablo.install
new file mode 100644
index 000000000000..6aac919c9473
--- /dev/null
+++ b/freeablo.install
@@ -0,0 +1,14 @@
+
+post_install() {
+  echo "Additional setup is needed, as freeablo only searches for resources in the"
+  echo "current directory:"
+  echo "$ mkdir -p ~/.freeablo ; cp -rup /usr/share/freeablo/resources ~/.freeablo"
+  echo "You also need to put the files 'DIABDAT.MPQ' and 'Diablo.exe' there."
+  echo ""
+  echo "To launch it, use this:"
+  echo "$ cd ~/.freeablo && freeablo"
+}
+
+post_upgrade() {
+  post_install
+}