From 5a4ab07bbfa72ad62da5a8c3a2ef1ff5c47aa6a3a6474525b01ce2e6f4a9bd61 Mon Sep 17 00:00:00 2001 From: c unix Date: Thu, 30 Jun 2022 16:40:50 +0000 Subject: [PATCH] Accepting request 985771 from openSUSE:Factory:RISCV - Fix name of installable binaries OBS-URL: https://build.opensuse.org/request/show/985771 OBS-URL: https://build.opensuse.org/package/show/games/godot?expand=0&rev=40 --- godot.changes | 5 +++++ godot.spec | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/godot.changes b/godot.changes index 3d03af0..20f6328 100644 --- a/godot.changes +++ b/godot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 29 11:22:45 UTC 2022 - Andreas Schwab + +- Fix name of installable binaries + ------------------------------------------------------------------- Sat Mar 26 12:00:00 UTC 2022 - cunix@mail.de diff --git a/godot.spec b/godot.spec index c251b4c..7635428 100644 --- a/godot.spec +++ b/godot.spec @@ -1,7 +1,7 @@ # # spec file for package godot # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2017 Luke Jones, luke.nukem.jones@gmail.com # # All modifications and additions to the file contributed by third parties @@ -90,15 +90,15 @@ BuildRequires: mbedtls-devel Requires: ca-certificates Recommends: ca-certificates-mozilla Requires(post): update-desktop-files -Requires(postun): update-desktop-files +Requires(postun):update-desktop-files Recommends: %{name}-bash-completion Suggests: %{name}-headless = %{version} Suggests: %{name}-runner = %{version} Suggests: %{name}-server = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -# The following "Provides: bundled()" and comments were taken from the -# Fedora Godot specfile. +# The following "Provides: bundled()" and comments were taken from the +# Fedora Godot specfile. # Link: https://src.fedoraproject.org/rpms/godot/blob/master/f/godot.spec # Has some modifications for IPv6 support, upstream enet is unresponsive @@ -180,7 +180,7 @@ Recommends: ca-certificates-mozilla Suggests: %{name}-bash-completion %description headless -This package is the headless version of the Godot editor that is suited for +This package is the headless version of the Godot editor that is suited for exporting Godot games on the command line. %package runner @@ -332,7 +332,12 @@ scons %{build_args} platform=server tools=no target=release %install # Installing the editor -install -D -p -m 755 bin/%{name}.x11.opt.tools.%{__isa_bits} %{buildroot}%{_bindir}/%{name} +%ifarch riscv64 +suffix=rv64 +%else +suffix=%{__isa_bits} +%endif +install -D -p -m 755 bin/%{name}.x11.opt.tools.$suffix %{buildroot}%{_bindir}/%{name} install -D -p -m 644 misc/dist/linux/godot.6 %{buildroot}/%{_mandir}/man6/%{name}.6%{?ext_man} install -D -p -m 644 icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png @@ -342,13 +347,13 @@ install -D -p -m 644 misc/dist/linux/org.godotengine.Godot.appdata.xml %{buildr %if !0%{?faster_build} # Installing the headless editor -install -D -p -m 755 bin/%{name}_server.x11.opt.tools.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-headless +install -D -p -m 755 bin/%{name}_server.x11.opt.tools.$suffix %{buildroot}%{_bindir}/%{name}-headless # Installing the runner -install -D -p -m 755 bin/%{name}.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-runner +install -D -p -m 755 bin/%{name}.x11.opt.$suffix %{buildroot}%{_bindir}/%{name}-runner # Installing the server -install -D -p -m 755 bin/%{name}_server.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-server +install -D -p -m 755 bin/%{name}_server.x11.opt.$suffix %{buildroot}%{_bindir}/%{name}-server %endif # Installing bash-completion