From 428a537d6c404888983baf22fdbc8987733edae2 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 3 Feb 2018 11:48:58 +0100 Subject: [PATCH] widelands: multiple packaging fixes - widelands looks for it's data relative to the path were the binary resides, use an absolute path instead so the data will be found - wl_render_richtext was installed in /usr, move it to /usr/bin - COPYING, CREDITS, Changelog and VERSION are installed in /usr, remove them before packaging Closes: #11367 [via git-merge-pr] --- srcpkgs/widelands/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template index ef025f88cd1..15d83ae27c5 100644 --- a/srcpkgs/widelands/template +++ b/srcpkgs/widelands/template @@ -1,13 +1,13 @@ # Template file for 'widelands' pkgname=widelands version=19 -revision=4 +revision=5 wrksrc=${pkgname}-build${version}-src build_style=cmake configure_args=" -DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DOPTION_BUILD_WEBSITE_TOOLS=OFF - -DWL_INSTALL_DATADIR=share/widelands" + -DWL_INSTALL_DATADIR=/usr/share/widelands" hostmakedepends="python pkg-config" makedepends="boost-devel icu-devel minizip-devel gettext-devel glu-devel glew-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel @@ -34,6 +34,10 @@ post_install() { # For some reason the binary is installed as /usr/widelands - move it vmkdir usr/bin mv ${DESTDIR}/usr/${pkgname} ${DESTDIR}/usr/bin + mv ${DESTDIR}/usr/wl_render_richtext ${DESTDIR}/usr/bin + + # Remove files not needed in the package + rm -f ${DESTDIR}/usr/COPYING ${DESTDIR}/usr/CREDITS ${DESTDIR}/usr/ChangeLog ${DESTDIR}/usr/VERSION vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications }