Hello community, here is the log from the commit of package sdl-asylum for openSUSE:Factory checked in at 2018-11-08 09:50:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sdl-asylum (Old) and /work/SRC/openSUSE:Factory/.sdl-asylum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdl-asylum" Thu Nov 8 09:50:54 2018 rev:3 rq:647048 version:0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sdl-asylum/sdl-asylum.changes 2017-04-20 20:51:57.307436935 +0200 +++ /work/SRC/openSUSE:Factory/.sdl-asylum.new/sdl-asylum.changes 2018-11-08 09:50:54.928928039 +0100 @@ -1,0 +2,6 @@ +Wed Nov 7 16:07:52 UTC 2018 - Jan Engelhardt <[email protected]> + +- Add return-in-nonvoid.diff to fix rpmlint aborting due to bad + code. [boo#1115061] + +------------------------------------------------------------------- New: ---- return-in-nonvoid.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sdl-asylum.spec ++++++ --- /var/tmp/diff_new_pack.UoLYpC/_old 2018-11-08 09:50:55.396927485 +0100 +++ /var/tmp/diff_new_pack.UoLYpC/_new 2018-11-08 09:50:55.404927476 +0100 @@ -1,7 +1,7 @@ # # spec file for package sdl-asylum # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,12 +22,13 @@ Version: 0.3.2 Release: 0 Summary: Asylum like game -License: GPL-3.0+ and SUSE-Public-Domain +License: GPL-3.0-or-later AND SUSE-Public-Domain Group: Amusements/Games/Logic Url: http://sdl-asylum.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/Asylum/%{version}/%{oname}-%{version}.tar.gz Source1: %{name}.png Source2: %{name}.desktop +Patch1: return-in-nonvoid.diff %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: update-desktop-files @@ -50,6 +51,7 @@ %prep %setup -q -n asylum-%{version} +%patch -P 1 -p1 # SED-FIX-OPENSUSE -- Fix Paths and Highscore sed -i -e 's|/usr/games/asylum|$(DESTDIR)/usr/bin/%{name}|; @@ -59,7 +61,7 @@ s|$(CHGRP) -R $(INSTALLGROUP)|#$(CHGRP) -R $(INSTALLGROUP)|' Makefile %build -make +make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_bindir} ++++++ return-in-nonvoid.diff ++++++ From: Jan Engelhardt <[email protected]> 2018-11-07 17:07:37.291493768 +0100 Fix a few things that upset rpmlint (which then failed the build). file.c: In function 'int swi_osfile(int, const char*, char*, char*)': file.c:350:1: warning: control reaches end of non-void function [-Wreturn-type] keyboard.c: In function 'int swi_joystick_read(int, int*, int*)': keyboard.c:92:1: warning: no return statement in function returning non-void [-Wreturn-type] sound.c: In function 'int swi_sound_speaker(int)': sound.c:397:1: warning: no return statement in function returning non-void [-Wreturn-type] --- file.c | 1 + keyboard.c | 2 +- sound.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) Index: asylum-0.3.2/file.c =================================================================== --- asylum-0.3.2.orig/file.c +++ asylum-0.3.2/file.c @@ -347,6 +347,7 @@ int swi_osfile(int op, const char* name, fclose(f); return 0; } + return 0; } int swi_blitz_hammerop(int op, char* name, char* path, char* space) Index: asylum-0.3.2/keyboard.c =================================================================== --- asylum-0.3.2.orig/keyboard.c +++ asylum-0.3.2/keyboard.c @@ -88,7 +88,7 @@ char swi_oscrc(int w, char* start, char* int swi_joystick_read(int a, int* x, int* y) { - ; + return 0; } void update_keyboard() Index: asylum-0.3.2/sound.c =================================================================== --- asylum-0.3.2.orig/sound.c +++ asylum-0.3.2/sound.c @@ -393,7 +393,7 @@ void swi_sound_control(int c, int a, int } int swi_sound_speaker(int s) { - ; + return 0; } void swi_stasis_link(int a, int b) {
