diff --git a/vegastrike-0.5.1-gcc6.patch b/vegastrike-0.5.1-gcc6.patch new file mode 100644 index 0000000..da51a10 --- /dev/null +++ b/vegastrike-0.5.1-gcc6.patch @@ -0,0 +1,96 @@ +diff -up vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp~ vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp +--- vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp~ 2010-12-23 21:16:48.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp 2016-02-22 15:06:26.685860746 +0100 +@@ -2060,7 +2060,7 @@ void Base::DrawWin() + int main( int argc, char **argv ) + { + printf( "Loading...\n" ); +- Base::CurrentBase = false; ++ Base::CurrentBase = NULL; + glutInit( &argc, argv ); + glutInitWindowSize( 800, 600 ); + g_game.x_resolution = 800; +diff -up vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp~ vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp +--- vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp~ 2012-03-19 09:20:14.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp 2016-02-22 14:52:31.923323837 +0100 +@@ -630,14 +630,6 @@ void Unit::DeactivateJumpDrive() + jump.drive = -1; + } + +-float copysign( float x, float y ) +-{ +- if (y > 0) +- return x; +- else +- return -x; +-} +- + float rand01() + { + return (float) rand()/(float) RAND_MAX; +diff -up vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h~ vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h +--- vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h~ 2012-03-19 09:20:14.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h 2016-02-22 14:48:18.098979895 +0100 +@@ -41,8 +41,6 @@ + #include "networking/lowlevel/vsnet_clientstate.h" + #include "networking/netclient.h" + +-extern float copysign( float x, float y ); +- + extern unsigned int apply_float_to_unsigned_int( float tmp ); //short fix + + template < class UnitType > +diff -up vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp~ vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp +--- vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp~ 2010-12-15 09:53:40.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp 2016-02-22 15:01:47.384341654 +0100 +@@ -315,7 +315,7 @@ void GameCockpit::beginElement( const st + for (counter = 0; counter < 4; ++counter) + if (!replaced[counter]) { + delete Pit[counter]; +- Pit[counter] = false; ++ Pit[counter] = NULL; + } + break; + case UnitImages< void >::SHIELD4: +diff -up vegastrike-src-0.5.1.r1/src/physics.h~ vegastrike-src-0.5.1.r1/src/physics.h +--- vegastrike-src-0.5.1.r1/src/physics.h~ 2011-02-12 04:19:03.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/src/physics.h 2016-02-22 14:48:24.803015392 +0100 +@@ -27,7 +27,6 @@ + static const float oocc = (float) 0.0000000000000000111265005605; //1/c^2 + static const float c = (float) 299792458.0; + static const float co10 = (float) 29979245.8; +-float copysign( float x, float y ); + + struct Force + { +diff -up vegastrike-src-0.5.1.r1/src/pk3.cpp~ vegastrike-src-0.5.1.r1/src/pk3.cpp +--- vegastrike-src-0.5.1.r1/src/pk3.cpp~ 2012-03-19 09:20:14.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/src/pk3.cpp 2016-02-22 14:55:07.605167298 +0100 +@@ -356,7 +356,7 @@ char* CPK3::ExtractFile( const char *lpn + } + //if the file isn't in the archive + if (index == -1) +- return false; ++ return NULL; + int flength = GetFileLen( index ); + + buffer = new char[flength]; +diff -up vegastrike-src-0.5.1.r1/src/ship_commands.cpp~ vegastrike-src-0.5.1.r1/src/ship_commands.cpp +--- vegastrike-src-0.5.1.r1/src/ship_commands.cpp~ 2012-03-19 09:20:14.000000000 +0100 ++++ vegastrike-src-0.5.1.r1/src/ship_commands.cpp 2016-02-22 14:57:46.631032223 +0100 +@@ -5,15 +5,6 @@ + #include "universe_util.h" + #include "gldrv/winsys.h" + +-static inline float fmin( float a, float b ) +-{ +- return (a < b) ? a : b; +-} +-static inline float fmax( float a, float b ) +-{ +- return (a > b) ? a : b; +-} +- + class ShipCommands + { + Functor< ShipCommands > *csetkps; diff --git a/vegastrike.appdata.xml b/vegastrike.appdata.xml new file mode 100644 index 0000000..18c9408 --- /dev/null +++ b/vegastrike.appdata.xml @@ -0,0 +1,25 @@ + + + vegastrike.desktop + CC0-1.0 + GPL-2.0+ + Vega Strike + 3D Action RPG spaceflight simulator + +

+ Vega Strike is a GPL 3D OpenGL Action RPG space sim that allows a player + to trade and bounty hunt. You start in an old beat up Wayfarer cargo ship, + with endless possibility before you and just enough cash to scrape + together a life. Yet danger lurks in the space beyond. +

+ + http://vegastrike.sourceforge.net/ + + http://forums.vega-strike.org/cpg/albums/user_screenshots/Goddard06.png + http://forums.vega-strike.org/cpg/albums/vs_screenshots/asteroid_field.jpg + http://forums.vega-strike.org/cpg/albums/vs_screenshots/fin2.png + http://forums.vega-strike.org/cpg/albums/vs_screenshots/vegastrike040_002.jpg + http://forums.vega-strike.org/cpg/albums/vs_screenshots/PlowSPEC.jpg + + jwrdegoede_at_fedoraproject.org + diff --git a/vegastrike.desktop b/vegastrike.desktop index d14fa0a..1912764 100644 --- a/vegastrike.desktop +++ b/vegastrike.desktop @@ -6,3 +6,4 @@ Icon=vegastrike Terminal=false Type=Application Categories=Game;Simulation; +Keywords=vega;strike;3d;action;rpg;space;spaceflight;simulator;trade; diff --git a/vegastrike.spec b/vegastrike.spec index afeee4c..3f69f05 100644 --- a/vegastrike.spec +++ b/vegastrike.spec @@ -1,6 +1,6 @@ Name: vegastrike Version: 0.5.1 -Release: 26.r1%{?dist} +Release: 27.r1%{?dist} Summary: 3D OpenGL spaceflight simulator Group: Amusements/Games License: GPLv2+ @@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}. Source1: %{name}-manpages.tar.bz2 Source2: %{name}-wrapper.sh Source3: %{name}.desktop +Source4: %{name}.appdata.xml Patch0: vegastrike-0.5.1-char-fix.patch Patch1: vegastrike-0.5.1-paths-fix.patch Patch2: vegastrike-0.4.2-posh-fix.patch @@ -25,12 +26,13 @@ Patch15: vegastrike-0.5.1-music.patch Patch16: vegastrike-0.5.1-gcc48.patch Patch17: vegastrike-0.5.1-boost154.patch Patch18: vegastrike-aarch64.patch +Patch19: vegastrike-0.5.1-gcc6.patch BuildRequires: libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel BuildRequires: libjpeg-devel libpng-devel boost-devel expat-devel python-devel BuildRequires: SDL_mixer-devel openal-soft-devel freealut-devel BuildRequires: libvorbis-devel ogre-devel cegui-devel desktop-file-utils -Requires: %{name}-data = %{version}, hicolor-icon-theme, xdg-utils -Requires: opengl-games-utils +BuildRequires: libappstream-glib +Requires: %{name}-data = %{version}, xdg-utils, opengl-games-utils %description Vega Strike is a GPL 3D OpenGL Action RPG space sim that allows a player to @@ -55,6 +57,7 @@ Yet danger lurks in the space beyond. %patch16 -p0 %patch17 -p1 %patch18 -p1 +%patch19 -p1 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp touch -r README README.tmp mv README.tmp README @@ -89,21 +92,29 @@ install -p -m 644 *.6 $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE3} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet \ + $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml %files -%doc AUTHORS COPYING DOCUMENTATION README ToDo.txt +%doc AUTHORS DOCUMENTATION README ToDo.txt +%license COPYING %{_bindir}/vega* %{_bindir}/vs* %{_libexecdir}/%{name} %{_mandir}/man6/* +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %changelog +* Mon Feb 22 2016 Hans de Goede - 0.5.1-27.r1 +- Fix FTBFS (rhbz#1308225) +- Add appdata + * Fri Feb 05 2016 Fedora Release Engineering - 0.5.1-26.r1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild