From 0d72f3fcce7b86113dac2c50687c87da268cf0d4b7112eba97948078dcb79714 Mon Sep 17 00:00:00 2001 From: Claes Backstrom Date: Thu, 6 Jul 2017 20:59:20 +0000 Subject: [PATCH] Accepting request 508404 from home:okurz:branches:games Fix fatal error on startup referencing wrong data directory OBS-URL: https://build.opensuse.org/request/show/508404 OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=37 --- widelands.changes | 5 +++++ widelands.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/widelands.changes b/widelands.changes index 4c65e05..4b3c156 100644 --- a/widelands.changes +++ b/widelands.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 5 19:17:42 UTC 2017 - okurz@suse.com + +- Fix fatal error on startup referencing wrong data directory + ------------------------------------------------------------------- Thu Jun 22 07:43:39 UTC 2017 - okurz@suse.com diff --git a/widelands.spec b/widelands.spec index 016a3f8..d699835 100644 --- a/widelands.spec +++ b/widelands.spec @@ -92,7 +92,7 @@ sed -i 's/\(install(TARGETS ${NAME} DESTINATION \)"."\( COMPONENT ExecutableFile -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWL_INSTALL_PREFIX=%{_prefix} \ -DWL_INSTALL_BINDIR=bin \ - -DWL_INSTALL_DATADIR=share/%{name} \ + -DWL_INSTALL_DATADIR=%{_datadir}/%{name} \ -DWL_INSTALL_LOCALEDIR=%{_datadir}/%{name}/locale \ -DCMAKE_BUILD_TYPE="Release" \ -DBoost_USE_STATIC_LIBS=OFF \ @@ -112,6 +112,8 @@ install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.deskt rm -f %{buildroot}%{_prefix}/{COPYING,CREDITS,ChangeLog,VERSION} # No need to execute tests as they are already executed implicitly on install +# instead do post-install test +PATH=%{buildroot}%{_bindir}:$PATH widelands --help | grep 'This is Widelands' %files %defattr(-,root,root,-)