commit sdl-asylum for openSUSE:Factory
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.changes2017-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
+
+- 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
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)
{
commit sdl-asylum for openSUSE:Factory
Hello community,
here is the log from the commit of package sdl-asylum for openSUSE:Factory
checked in at 2017-04-20 20:51:56
Comparing /work/SRC/openSUSE:Factory/sdl-asylum (Old)
and /work/SRC/openSUSE:Factory/.sdl-asylum.new (New)
Package is "sdl-asylum"
Thu Apr 20 20:51:56 2017 rev:2 rq:487455 version:0.3.2
Changes:
--- /work/SRC/openSUSE:Factory/sdl-asylum/sdl-asylum.changes2015-06-23
11:56:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.sdl-asylum.new/sdl-asylum.changes
2017-04-20 20:51:57.307436935 +0200
@@ -1,0 +2,5 @@
+Fri Apr 7 19:13:12 UTC 2017 - meiss...@suse.com
+
+- own /var/games as filesystem no longer owns it
+
+---
Other differences:
--
++ sdl-asylum.spec ++
--- /var/tmp/diff_new_pack.dw9iEr/_old 2017-04-20 20:51:57.955345319 +0200
+++ /var/tmp/diff_new_pack.dw9iEr/_new 2017-04-20 20:51:57.955345319 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sdl-asylum
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -35,9 +35,9 @@
BuildRequires: gcc-c++
BuildRequires: pkgconfig(SDL_image)
BuildRequires: pkgconfig(SDL_mixer)
-BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(sdl)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -71,7 +71,6 @@
# install Desktop file
install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop
-
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%fdupes -s %{buildroot}%{_prefix}
@@ -84,6 +83,7 @@
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}
+%dir %{_localstatedir}/games/
%attr(0755,root,games) %{_localstatedir}/games/%{name}
%config(noreplace) %attr(0664,root,games)
%{_localstatedir}/games/%{name}/EgoHighScores
%config(noreplace) %attr(0664,root,games)
%{_localstatedir}/games/%{name}/ExtendedHighScores
commit sdl-asylum for openSUSE:Factory
Hello community,
here is the log from the commit of package sdl-asylum for openSUSE:Factory
checked in at 2015-06-23 11:55:59
Comparing /work/SRC/openSUSE:Factory/sdl-asylum (Old)
and /work/SRC/openSUSE:Factory/.sdl-asylum.new (New)
Package is sdl-asylum
Changes:
New Changes file:
--- /dev/null 2015-05-15 19:41:08.266053825 +0200
+++ /work/SRC/openSUSE:Factory/.sdl-asylum.new/sdl-asylum.changes
2015-06-23 11:56:01.0 +0200
@@ -0,0 +1,5 @@
+---
+Mon Jun 15 22:01:17 UTC 2015 - nemy...@gmx.ch
+
+- Initial package creation
+
New:
asylum-0.3.2.tar.gz
sdl-asylum.changes
sdl-asylum.desktop
sdl-asylum.png
sdl-asylum.spec
Other differences:
--
++ sdl-asylum.spec ++
#
# spec file for package sdl-asylum
#
# Copyright (c) 2015 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# 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/
#
%define oname asylum
Name: sdl-asylum
Version:0.3.2
Release:0
Summary:Asylum like game
License:GPL-3.0+ 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
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: update-desktop-files
%endif
BuildRequires: gcc-c++
BuildRequires: pkgconfig(SDL_image)
BuildRequires: pkgconfig(SDL_mixer)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Young Sigmund has a few problems. To help him resolve his mental instability
you must enter the surreal world of his inner mind and shut down the
malfunctioning brain cells.
SDL Asylum is a C port of the computer game Asylum, which was written by Andy
Southgate in 1994 for the Acorn Archimedes and is now public domain.
%prep
%setup -q -n asylum-%{version}
# SED-FIX-OPENSUSE -- Fix Paths and Highscore
sed -i -e 's|/usr/games/asylum|$(DESTDIR)/usr/bin/%{name}|;
s|/usr/share/games/asylum|$(DESTDIR)/usr/share/%{name}|;
s|/var/games/asylum|$(DESTDIR)/var/games/%{name}|;
s|$(CHGRP) $(INSTALLGROUP)|#$(CHGRP) $(INSTALLGROUP)|;
s|$(CHGRP) -R $(INSTALLGROUP)|#$(CHGRP) -R $(INSTALLGROUP)|' Makefile
%build
make
%install
mkdir -p %{buildroot}%{_bindir}
%make_install
# install icon
install -Dm 0644 %{S:1} %{buildroot}/%{_datadir}/pixmaps/%{name}.png
# install Desktop file
install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%fdupes -s %{buildroot}%{_prefix}
%endif
%files
%defattr(-,root,root,-)
%doc COPYING Instruct README
%attr(0755,root,games) %{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}
%attr(0755,root,games) %{_localstatedir}/games/%{name}
%config(noreplace) %attr(0664,root,games)
%{_localstatedir}/games/%{name}/EgoHighScores
%config(noreplace) %attr(0664,root,games)
%{_localstatedir}/games/%{name}/ExtendedHighScores
%config(noreplace) %attr(0664,root,games)
%{_localstatedir}/games/%{name}/IdHighScores
%config(noreplace) %attr(0664,root,games)
%{_localstatedir}/games/%{name}/PsycheHighScores
%changelog
++ sdl-asylum.desktop ++
[Desktop Entry]
Name=SDL Asylum
GenericName=Asylum
Comment=Young Sigmund has a few problems
Icon=sdl-asylum
Exec=sdl-asylum
Type=Application
Categories=Game;LogicGame;
StartupNotify=false
