[upd] 0.61→0.62

Compensate changed directory layout and executable name.

5 files changed, 28 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9be1e62d3673..af1508c5a331 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = corsix-th
 	pkgdesc = Reimplementation of the game engine of Theme Hospital
-	pkgver = 0.61
+	pkgver = 0.62
 	pkgrel = 1
 	url = https://github.com/CorsixTH/CorsixTH
 	install = corsix-th.install
@@ -9,18 +9,17 @@ pkgbase = corsix-th
 	arch = armv7h
 	license = MIT
 	makedepends = cmake
+	makedepends = librsvg
 	depends = lua
 	depends = lua-lpeg
 	depends = lua-filesystem
 	depends = sdl2_mixer
 	depends = ffmpeg
 	depends = timidity-freepats
-	source = corsix-th-0.61.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.61.tar.gz
-	source = corsix-th.sh
+	source = corsix-th-0.62.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.62.tar.gz
 	source = corsix-th.desktop
-	sha256sums = b8e19743cd499436dce58af67479997e621fe50e21e31f08f440d2303e11f5d6
-	sha256sums = 3614197a30498774fff4055ee54d82a812a8b88eba353b70c3288a09ff700158
-	sha256sums = f802f8acdc8b3d0370344c608b780620f83a21f04bdf32507466adb4222ba4bc
+	sha256sums = b219270310255493c881a09bb4a5569f34a72cdaf3c3be920c1036a2450317ce
+	sha256sums = a5ad57b78de82c93c9d451eca753f1fb3e78094fd86ac73fca44d759c450242f
 
 pkgname = corsix-th
 
diff --git a/PKGBUILD b/PKGBUILD
index 3b9399616b3f..849b8192d7ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,42 @@
 # Contributors: jdc, rayman2200, TheCycoONE
 
 pkgname=corsix-th
-pkgver=0.61
+pkgver=0.62
 pkgrel=1
 pkgdesc='Reimplementation of the game engine of Theme Hospital'
 url='https://github.com/CorsixTH/CorsixTH'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-makedepends=('cmake')
+makedepends=('cmake' 'librsvg')
 depends=('lua' 'lua-lpeg' 'lua-filesystem' 'sdl2_mixer' 'ffmpeg' 'timidity-freepats')
 install=$pkgname.install
 source=($pkgname-$pkgver.tar.gz::"https://github.com/CorsixTH/CorsixTH/archive/v$pkgver.tar.gz"
-        "$pkgname.sh"
         "$pkgname.desktop")
-sha256sums=('b8e19743cd499436dce58af67479997e621fe50e21e31f08f440d2303e11f5d6'
-            '3614197a30498774fff4055ee54d82a812a8b88eba353b70c3288a09ff700158'
-            'f802f8acdc8b3d0370344c608b780620f83a21f04bdf32507466adb4222ba4bc')
+sha256sums=('b219270310255493c881a09bb4a5569f34a72cdaf3c3be920c1036a2450317ce'
+            'a5ad57b78de82c93c9d451eca753f1fb3e78094fd86ac73fca44d759c450242f')
+
+prepare() {
+  # convert icon
+  rsvg-convert -h 48 -a -o $pkgname.png CorsixTH-$pkgver/CorsixTH/Original_Logo.svg
+}
 
 build() {
   cd CorsixTH-$pkgver
 
   cmake -DCMAKE_BUILD_TYPE=Release -Wno-dev \
-        -DCMAKE_INSTALL_PREFIX=/usr/share/ .
+        -DCMAKE_INSTALL_PREFIX=/usr .
   cd CorsixTH
   make
 }
 
 package() {
   make -C CorsixTH-$pkgver/CorsixTH DESTDIR="$pkgdir/" install
-  # launcher
-  install -Dm0755 $pkgname.sh "$pkgdir"/usr/bin/CorsixTH
+  # executable name changed with 0.62
+  ln -s $pkgname "$pkgdir"/usr/bin/CorsixTH
   # license
-  install -Dm0644 CorsixTH-$pkgver/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  ln -s /usr/share/corsix-th/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/
   # .desktop integration
   install -Dm0644 $pkgname.desktop "$pkgdir"/usr/share/applications/CorsixTH.desktop
+  install -Dm0644 $pkgname.png "$pkgdir"/usr/share/pixmaps/CorsixTH.png
 }
diff --git a/corsix-th.desktop b/corsix-th.desktop
index a1c3b93fdd19..d038955aaeea 100644
--- a/corsix-th.desktop
+++ b/corsix-th.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=CorsixTH
-Exec=CorsixTH
-Icon=/usr/share/CorsixTH/CorsixTH.ico
+Exec=corsix-th
+Icon=CorsixTH
 Comment=A Theme Hospital Clone
 Terminal=false
 Categories=Game;StrategyGame;
diff --git a/corsix-th.install b/corsix-th.install
index f8f0a14586ba..2b5a20b48085 100644
--- a/corsix-th.install
+++ b/corsix-th.install
@@ -4,3 +4,9 @@ post_install() {
   echo "=> you can download the data files of the demo:"
   echo "=> http://th.corsix.org/Demo.zip"
 }
+
+post_upgrade() {
+  if [[ $(vercmp "$2" "0.61") -ne 1 && $(vercmp "0.62" "$1") -ne 1 ]]; then
+    echo "Note: The executable name has been changed from 'CorsixTH' to 'corsix-th'."
+  fi
+}
diff --git a/corsix-th.sh b/corsix-th.sh
deleted file mode 100644
index 545bab32e5d6..000000000000
--- a/corsix-th.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/share/CorsixTH/CorsixTH