Hello community, here is the log from the commit of package sopwith for openSUSE:Factory checked in at 2015-04-02 16:04:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sopwith (Old) and /work/SRC/openSUSE:Factory/.sopwith.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sopwith" Changes: -------- --- /work/SRC/openSUSE:Factory/sopwith/sopwith.changes 2012-08-04 13:28:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sopwith.new/sopwith.changes 2015-04-02 16:04:33.000000000 +0200 @@ -1,0 +2,87 @@ +Wed Mar 25 16:08:38 UTC 2015 - [email protected] + +- Update to version 1.8.4 + * Updated man page (doc/sopwith.6) to match Debian's manual page. + * Bring Sopwith up to date with bug fixes provided by Fedora. + This should avoid crash on start-up problems and makes + compiling more robust. +- Changes from version 1.8.3 + * The function asynclos() in swasynio.c includes a parameter + which is never used. Calling functions do not bother passing + a parameter. To avoid undefined behaviour the definition of + aynclos() has been fixed. (bdo#748172) + * Updated manual page to provide current default keys and + mention the location of the custom keys file (~/.sopwith/keys) + * Removed stray object files from tarball. + * Added rule to makefile "tarball" which performs more + complete clean-up and makes tarball in parent directory. +- Changes from version 1.8.2 + * Added SDL_CFLAGS flag to src/Makefile to bring us + in line with FreeBSD patches. + * Updated copyright notice on help screen. + * Removed compiler optimiations to avoid crashes when game is + built using versions of GCC newer than 4.6. +- Changes from version 1.8.1 + * Corrected initialization error would would prevent sound + from playing at start-up. + * Updated documentation to include command line flags for + playing music (-p) and starting Sopwith in quiet mode (-q). +- Changes from version 1.8.0 + * Most distributions are moving to GTK-3, sopwith's legacy code uses + GTK-2. Dropping GTK support in favour of SDL. + * Modified configure script. + * Patched crash caused by failure to find a suitable video device. + * Modified src/sdl/video.c to add new check. + * Fixed configure warings related to datarootdir variable. +- Changes from version 1.7.5 + * Cleaned up code to avoid compile warnings. Sopwith now + builds cleanly using Clang 3.0 and GCC 4.6. + * Added custom keys option. Controls can be altered by + adjusting the values in the ~/.sopwith/keys file. On + Windows this file should be located in the user's profile + under "AppData/Local/.sopwith/keys". +- Changes from version 1.7.4 + * Added man page patch to update documentation. + * Added include statements in vid_vga.c and sdl/video.c to bring + us in line with Debian's patches. + * Applied patch to swasynio.c to correct spelling errors. + * Oil tank explosions should be a little more intense now. These + larger/faster explosions can be turned off at the command line + by using the "-e" flag. (bdo#188298.) +- Changes from version 1.7.3 + * Added range check patch to avoid crashes when plan or missile + is close to the edge of the map. (bdo#224518 and bdo#258751) + * Mouse pointer no longer appears over Sopwith window. + (bdo#187930) + * Depreciated gtk branch, updated configure/makefile scripts. + * Sound is now turned off by default. Sound can be turned on using + the -p flag from the command line. + * Fixed socket check in tcpcomm.c (error returns -1, not less than -2). + * When AI plane is chasing the player's plane, the AI plane will + now shoot if it is in position. (swauto.c) + * When the player's plane is damaged, the auto-pilot is less + manouverable, just like the player's controls. (swauto.c) + * Holding down the X or Z keys now causes the player's plane to + constantly speed up or slow down. Previously, the key had + to be rapidly tapped to change speed. (bdo#188301) + * Updated title screen to show exit message. + * Fixed compiler warning in swconf.c +- Changes from version 1.7.2 + * Cleaned up some compile errors from gcc 4.4.1 on Ubuntu. + (bdo#582399) + * Added -g command line option. -g and a number, such as -g2 + will start the game on difficulty level 2. Normally the + game starts at zero. (bdo#582398) +- Correct source Url +- Remove fixed on upstream patches + * sopwith-gcc4.patch + * sopwith.6.patch + * sopwith-gtk-video.patch + * sopwith-sdl-video.patch + * sopwith-vid_vga.patch +- Update sopwith-gpl.diff +- Add sopwith-fix-string-include.patch +- Remove gtk2-devel of require list; upstream has dropped gtk support +- Remove redundant %clean section + +------------------------------------------------------------------- Old: ---- sdl_sopwith-1.7.1.tar.gz sopwith-gcc4.patch sopwith-gtk-video.patch sopwith-sdl-video.patch sopwith-vid_vga.patch sopwith.6.patch New: ---- sopwith-1.8.4.tar.gz sopwith-fix-string-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sopwith.spec ++++++ --- /var/tmp/diff_new_pack.Ge3BoM/_old 2015-04-02 16:04:33.000000000 +0200 +++ /var/tmp/diff_new_pack.Ge3BoM/_new 2015-04-02 16:04:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sopwith # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -17,26 +17,21 @@ Name: sopwith -Version: 1.7.1 +Version: 1.8.4 Release: 0 -Summary: SDL port of the sopwith game +Summary: SDL port of the %{name} game License: GPL-2.0+ Group: Amusements/Games/Action/Arcade Url: http://sdl-sopwith.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sdl-sopwith/sdl_sopwith-%{version}.tar.gz -#Source0: http://downloads.sourceforge.net/project/sdl-sopwith/sdl_sopwith/%{version}/sopwith-%{version}.tar.gz -Source1: sopwith.png -Patch0: sopwith-gcc4.patch -Patch1: sopwith.6.patch -Patch2: sopwith-gtk-video.patch -Patch3: sopwith-sdl-video.patch -Patch4: sopwith-vid_vga.patch -Patch5: sopwith-gpl.diff +Source0: http://downloads.sourceforge.net/project/sdl-sopwith/sdl_%{name}/%{version}/%{name}-%{version}.tar.gz +Source1: %{name}.png +Patch0: %{name}-fix-string-include.patch +Patch5: %{name}-gpl.diff BuildRequires: SDL-devel BuildRequires: SDL_gfx-devel BuildRequires: desktop-file-utils -BuildRequires: gtk2-devel +BuildRequires: hicolor-icon-theme %description This is a port of the classic computer game "Sopwith" to run on modern @@ -44,32 +39,28 @@ %prep -%setup -q -n sdl_sopwith-%{version} +%setup -q rm -f src/font.h %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 sed -i 's/\r//' doc/readme.txt %build -%configure +%configure --docdir=%{_docdir} make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/sopwith +rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/%{name} cat > %{name}.desktop <<EOF [Desktop Entry] Name=Sopwith Type=Application -Comment=The classic sopwith game -Exec=gtksopwith +Comment=The classic %{name} game +Exec=%{name} Terminal=false -Icon=sopwith +Icon=%{name} EOF desktop-file-install --delete-original \ @@ -78,19 +69,15 @@ --add-category Game \ %{name}.desktop -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/72x72/apps/ +cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/72x72/apps/ %files %defattr(-,root,root,-) %doc AUTHORS COPYING FAQ NEWS README TODO doc/keys.txt doc/origdoc.txt doc/readme.txt -%{_bindir}/sopwith -%{_bindir}/gtksopwith -%{_mandir}/man6/sopwith* +%{_bindir}/%{name} +%{_mandir}/man6/%{name}* %{_datadir}/applications/*%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/ %changelog ++++++ sopwith-fix-string-include.patch ++++++ --- a/src/gtk/video.c 2014-11-17 22:24:44.000000000 +0100 +++ b/src/gtk/video.c 2015-03-25 16:48:15.646422118 +0100 @@ -39,7 +39,7 @@ #include "vid_vga.c" -#include <string.> +#include <string.h> BOOL vid_fullscreen = FALSE; BOOL vid_double_size = TRUE; ++++++ sopwith-gpl.diff ++++++ --- /var/tmp/diff_new_pack.Ge3BoM/_old 2015-04-02 16:04:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Ge3BoM/_new 2015-04-02 16:04:34.000000000 +0200 @@ -11,7 +11,7 @@ #include "timer.h" #include "video.h" -@@ -49,7 +49,7 @@ static inline void drawchar(int x, int y +@@ -49,7 +49,7 @@ if (c < 0 || c >= 256) return;
