diff --git a/clanbomber-1.05-gcc6.patch b/clanbomber-1.05-gcc6.patch new file mode 100644 index 0000000..189745f --- /dev/null +++ b/clanbomber-1.05-gcc6.patch @@ -0,0 +1,24 @@ +diff -up clanbomber-1.05/clanbomber/Config.cpp~ clanbomber-1.05/clanbomber/Config.cpp +--- clanbomber-1.05/clanbomber/Config.cpp~ 2016-02-20 13:51:58.000000000 +0100 ++++ clanbomber-1.05/clanbomber/Config.cpp 2016-02-20 14:04:53.341302922 +0100 +@@ -524,7 +524,7 @@ bool Config::save(bool init) + bomber[7].set_name( "You" ); + } + +- ofstream configfile(filename); ++ ofstream configfile((const char *)filename); + + configfile << "27" << endl; // version + +diff -up clanbomber-1.05/clanbomber/Map.cpp~ clanbomber-1.05/clanbomber/Map.cpp +--- clanbomber-1.05/clanbomber/Map.cpp~ 2004-01-08 19:10:39.000000000 +0100 ++++ clanbomber-1.05/clanbomber/Map.cpp 2016-02-20 14:05:36.317306365 +0100 +@@ -739,7 +739,7 @@ void Map::save_selection() + filename = getenv("HOME"); + filename += "/.clanbomber/maps.disabled"; + #endif +- ofstream map_selection_file(filename); ++ ofstream map_selection_file((const char *)filename); + CL_Iterator map_entry_iterator(map_list); + while (map_entry_iterator.next()!=NULL) + { diff --git a/clanbomber.appdata.xml b/clanbomber.appdata.xml new file mode 100644 index 0000000..8a1b8d1 --- /dev/null +++ b/clanbomber.appdata.xml @@ -0,0 +1,29 @@ + + + clanbomber.desktop + CC0-1.0 + GPL-2.0+ + ClanBomber + Lay bombs and Blast the other players of the field + +

+ ClanBomber is a free multiplayer game, where the "purpose" is to Blast + the other players of the gamefield by laying bombs close to them. + While at the same time you must avoid being blown up yourself. +

+

+ It is fully playable and features Computer controlled bombers, however, + it is recommended to play ClanBomber with friends (3-8 players are + really fun). +

+
+ http://clanbomber.sourceforge.net/ + + http://clanbomber.sourceforge.net/screenshots/screen3.gif + http://clanbomber.sourceforge.net/screenshots/screen4.gif + http://clanbomber.sourceforge.net/screenshots/screen1.gif + http://clanbomber.sourceforge.net/screenshots/screen2.gif + http://clanbomber.sourceforge.net/screenshots/screen5.gif + + jwrdegoede_at_fedoraproject.org +
diff --git a/clanbomber.desktop b/clanbomber.desktop index 32e5934..c4aac0a 100644 --- a/clanbomber.desktop +++ b/clanbomber.desktop @@ -7,3 +7,4 @@ Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame;ActionGame; +Keywords=game;bomberman;bomber;clanbomber; diff --git a/clanbomber.spec b/clanbomber.spec index a9910a6..a19ff77 100644 --- a/clanbomber.spec +++ b/clanbomber.spec @@ -1,6 +1,6 @@ Name: clanbomber Version: 1.05 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Lay bombs and Blast the other players of the field game using ClanLib Group: Amusements/Games License: GPLv2+ @@ -8,10 +8,12 @@ URL: http://clanbomber.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: clanbomber.desktop Source2: clanbomber.png +Source3: clanbomber.appdata.xml Patch0: clanbomber-1.05-debian.patch Patch1: clanbomber-1.05-namespace.patch Patch2: clanbomber-1.05-make.patch -BuildRequires: ClanLib06-devel zlib-devel desktop-file-utils +Patch3: clanbomber-1.05-gcc6.patch +BuildRequires: ClanLib06-devel zlib-devel desktop-file-utils libappstream-glib Requires: hicolor-icon-theme %description @@ -21,16 +23,20 @@ While at the same time you must avoid being blown up yourself. It is fully playable and features Computer controlled bombers, however, it is recommended to play ClanBomber with friends (3-8 players are really fun). + %prep %setup -q %patch0 -p1 -z .deb %patch1 -p1 -z .namespace %patch2 -p1 +%patch3 -p1 + %build %configure --disable-dependency-tracking make + %install %make_install @@ -39,6 +45,11 @@ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet \ + $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml + %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -52,14 +63,22 @@ fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -%doc AUTHORS COPYING ChangeLog IDEAS QUOTES README +%doc AUTHORS ChangeLog IDEAS QUOTES README +%license COPYING %{_bindir}/%{name} %{_datadir}/%{name} +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png + %changelog +* Sat Feb 20 2016 Hans de Goede - 1.05-27 +- Fix FTBFS (rhbz#1307379) +- Add appdata + * Wed Feb 03 2016 Fedora Release Engineering - 1.05-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild