From 82f98ac8ca1598f773bc67dce64fa3c9a37761f4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Feb 20 2016 11:57:00 +0000 Subject: Fix FTBFS (rhbz#1307377) - Add appdata --- diff --git a/chromium-bsu-0.9.15.1-gcc6.patch b/chromium-bsu-0.9.15.1-gcc6.patch new file mode 100644 index 0000000..5be79ac --- /dev/null +++ b/chromium-bsu-0.9.15.1-gcc6.patch @@ -0,0 +1,34 @@ +diff -up chromium-bsu-0.9.15.1/src/MainSDL_Event.cpp~ chromium-bsu-0.9.15.1/src/MainSDL_Event.cpp +--- chromium-bsu-0.9.15.1/src/MainSDL_Event.cpp~ 2013-05-25 07:35:51.000000000 +0200 ++++ chromium-bsu-0.9.15.1/src/MainSDL_Event.cpp 2016-02-20 12:34:47.882913042 +0100 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "Config.h" + +@@ -417,14 +418,14 @@ void MainSDL::keyMove() + #else + Uint8 *keystate = SDL_GetKeyState(NULL); + #endif +- if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4; +- if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4; +- if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4; +- if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4; +- if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } +- if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } +- if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; } +- if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; } ++ if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + fabsf(key_speed_x)*0.4; ++ if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + fabsf(key_speed_x)*0.4; ++ if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + fabsf(key_speed_y)*0.4; ++ if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + fabsf(key_speed_y)*0.4; ++ if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + fabsf(key_speed_x)*0.4; key_speed_y -= 2.0 + fabsf(key_speed_y)*0.4; } ++ if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + fabsf(key_speed_x)*0.4; key_speed_y -= 2.0 + fabsf(key_speed_y)*0.4; } ++ if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + fabsf(key_speed_x)*0.4; key_speed_y += 2.0 + fabsf(key_speed_y)*0.4; } ++ if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + fabsf(key_speed_x)*0.4; key_speed_y += 2.0 + fabsf(key_speed_y)*0.4; } + //float s = (1.0-game->speedAdj)+(game->speedAdj*0.7); + float s = 0.7; + key_speed_x *= s; diff --git a/chromium-bsu.appdata.xml b/chromium-bsu.appdata.xml new file mode 100644 index 0000000..1b57968 --- /dev/null +++ b/chromium-bsu.appdata.xml @@ -0,0 +1,32 @@ + + + chromium-bsu.desktop + CC0-1.0 + ClArtistic + Chromium B.S.U. + Fast paced, arcade-style, top-scrolling space shooter + +

+ You are captain of the cargo ship Chromium B.S.U., responsible for + delivering supplies to our troops on the front line. Your ship has a + small fleet of robotic fighters which you control from the relative + safety of the Chromium vessel. This is an OpenGL-based shoot 'em up + game with fine graphics. +

+

Your mission:

+
    +
  • Do not let ANY enemy ships get past your fighters! Each enemy ship that makes it past the bottom of the screen will attack the Chromium, and you lose a fighter.
    • +
  • Use your fighters as weapons! Crash into enemies to destroy them before they can get past you.
    • +
  • Strategic suicide is a powerful tactic! When the Chromium launches a new fighter, it releases a high energy burst which destroys all enemies in range.
    • +
  • Self-destruct to preserve your ammunition! A double-right-click will cause your current fighter to self-destruct. Before the ship blows up, it ejects its ammunition so that the next fighter can pick it up.
    • +
+ + http://chromium-bsu.sourceforge.net/ + http://chromium-bsu.sourceforge.net/info.htm + + http://chromium-bsu.sourceforge.net/images/chrom-scr-112400a.jpg + http://chromium-bsu.sourceforge.net/images/chrom-scr-112400b.jpg + http://chromium-bsu.sourceforge.net/images/annotated.jpg + + jwrdegoede_at_fedoraproject.org + diff --git a/chromium-bsu.spec b/chromium-bsu.spec index 25edfa7..78fb4ef 100644 --- a/chromium-bsu.spec +++ b/chromium-bsu.spec @@ -1,14 +1,17 @@ Name: chromium-bsu Version: 0.9.15.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast paced, arcade-style, top-scrolling space shooter Group: Amusements/Games License: Artistic clarified URL: http://chromium-bsu.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source1: %{name}.appdata.xml +Patch0: chromium-bsu-0.9.15.1-gcc6.patch BuildRequires: desktop-file-utils SDL-devel alsa-lib-devel libvorbis-devel BuildRequires: SDL_image-devel libpng-devel libglpng-devel quesoglc-devel BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 +BuildRequires: libappstream-glib Requires: hicolor-icon-theme %description @@ -20,6 +23,7 @@ vessel. This is an OpenGL-based shoot 'em up game with fine graphics. %prep %setup -q +%patch0 -p1 %build @@ -29,9 +33,12 @@ make %{?_smp_mflags} %install %make_install -cp -a AUTHORS README COPYING NEWS \ - $RPM_BUILD_ROOT%{_docdir}/%{name} %find_lang %{name} +cp -a AUTHORS README NEWS $RPM_BUILD_ROOT%{_docdir}/%{name} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet \ + $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml %post @@ -49,14 +56,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %doc %{_docdir}/%{name} +%license COPYING %{_bindir}/%{name} %{_datadir}/%{name} +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/64x64/apps/%{name}.png %{_mandir}/man6/%{name}.6.gz %changelog +* Sat Feb 20 2016 Hans de Goede - 0.9.15.1-8 +- Fix FTBFS (rhbz#1307377) +- Add appdata + * Wed Feb 03 2016 Fedora Release Engineering - 0.9.15.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild