[arch-commits] Commit in widelands/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Wednesday, September 29, 2021 @ 23:12:42
  Author: svenstaro
Revision: 1026014

upgpkg: widelands 1:1.0-2: Fix file locations

Modified:
  widelands/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-29 23:02:04 UTC (rev 1026013)
+++ PKGBUILD	2021-09-29 23:12:42 UTC (rev 1026014)
@@ -5,7 +5,7 @@
 pkgname=widelands
 pkgver=1.0
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('x86_64')
 url="https://widelands.org/"
@@ -23,8 +23,8 @@
 build() {
   cd $pkgname-$pkgver
 
-  cmake . \
-      -G Ninja . \
+  cmake \
+      -GNinja \
       -Bbuild \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=/usr \
@@ -38,9 +38,12 @@
 
   DESTDIR="$pkgdir" ninja -C build install
 
+  # Fix wrong locations of some installed files (upstream bug)
+  # See also FS#72240
   mkdir -p "$pkgdir"/usr/bin
-  mv "$pkgdir"/usr/{widelands,wl_map_object_info,wl_map_info} "$pkgdir"/usr/bin
+  mv "$pkgdir"/usr/{widelands,wl_map_object_info,wl_map_info,wl_create_spritesheet} "$pkgdir"/usr/bin
   mv "$pkgdir"/usr/{VERSION,ChangeLog,CREDITS} "$pkgdir"/usr/share/widelands
+  mv "$pkgdir"/share/* "$pkgdir"/usr/share/
 
   mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
   mv "$pkgdir"/usr/COPYING "$pkgdir"/usr/share/licenses/$pkgname