Hello community, here is the log from the commit of package 7kaa for openSUSE:Factory checked in at 2017-11-10 14:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/7kaa (Old) and /work/SRC/openSUSE:Factory/.7kaa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "7kaa" Fri Nov 10 14:56:14 2017 rev:5 rq:539085 version:2.14.7 Changes: -------- --- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes 2016-10-13 11:27:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.7kaa.new/7kaa.changes 2017-11-10 14:56:23.510260431 +0100 @@ -1,0 +2,16 @@ +Sat Nov 4 19:40:35 UTC 2017 - [email protected] + +- Update to 2.14.7 + * improving usability of the 7K multiplayer service at 7kfans.com + * added NAT punch-through support when using 7kfans.com, which will + make online play easier and more reliable. + * Game balancing changes and fixes, making the game more challenging + + The Fryhtans can attack more often. + + Spies are more stealthy. + + Greater being mana exploit has been fixed. + + Harder to brutally capture towns. +- File under correct Group +- Lint .spec file +- Rebase gcc6_char_cast.patch + +------------------------------------------------------------------- Old: ---- 7kaa-2.14.6.tar.xz New: ---- 7kaa-2.14.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 7kaa.spec ++++++ --- /var/tmp/diff_new_pack.RORlYd/_old 2017-11-10 14:56:27.610112143 +0100 +++ /var/tmp/diff_new_pack.RORlYd/_new 2017-11-10 14:56:27.614111999 +0100 @@ -1,7 +1,7 @@ # # spec file for package 7kaa # -# Copyright (c) 2016 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 @@ -17,27 +17,27 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines - Name: 7kaa -Version: 2.14.6 +Version: 2.14.7 Release: 0 Summary: Seven Kingdoms: Ancient Adversaries License: GPL-2.0 -Group: Amusements/Games/StrategyGame +Group: Amusements/Games/Strategy/Real Time Url: http://7kfans.com/ -Source0: http://sourceforge.net/projects/skfans/files/7KAA%20%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM - gcc6_char_cast.patch -- https://github.com/the3dfxdude/7kaa/issues/63 -Patch0: gcc6_char_cast.patch +Source0: https://github.com/the3dfxdude/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: %{name}.png Source2: %{name}.desktop +# PATCH-FIX-UPSTREAM - gcc6_char_cast.patch -- https://github.com/the3dfxdude/7kaa/issues/63 +Patch0: gcc6_char_cast.patch +BuildRequires: curl-devel BuildRequires: enet-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: openal-soft-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(sdl2) Recommends: %{name}-music -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Seven Kingdoms made departures from the traditional real-time strategy models @@ -69,16 +69,15 @@ %make_install # install icon -install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -Dm 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png # install Desktop file -install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop +install -Dm 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{name} %fdupes -s %{buildroot}%{_prefix} %files -%defattr(-,root,root,-) %doc COPYING README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop ++++++ 7kaa-2.14.6.tar.xz -> 7kaa-2.14.7.tar.xz ++++++ /work/SRC/openSUSE:Factory/7kaa/7kaa-2.14.6.tar.xz /work/SRC/openSUSE:Factory/.7kaa.new/7kaa-2.14.7.tar.xz differ: char 26, line 1 ++++++ gcc6_char_cast.patch ++++++ --- /var/tmp/diff_new_pack.RORlYd/_old 2017-11-10 14:56:27.678109684 +0100 +++ /var/tmp/diff_new_pack.RORlYd/_new 2017-11-10 14:56:27.678109684 +0100 @@ -1,15 +1,15 @@ --- - src/client/OBULLET.cpp | 4 - src/client/OGAMMAIN.cpp | 2 - src/client/OUNITAAT.cpp | 12 - - src/client/OUNITATB.cpp | 512 ++++++++++++++++++++++++------------------------ - src/client/OU_MARI.cpp | 6 + src/OBULLET.cpp | 4 + src/OGAMMAIN.cpp | 2 + src/OUNITAAT.cpp | 12 - + src/OUNITATB.cpp | 512 ++++++++++++++++++++++++------------------------ + src/OU_MARI.cpp | 6 5 files changed, 268 insertions(+), 268 deletions(-) -Index: 7kaa-2.14.5/src/client/OBULLET.cpp +Index: a/src/OBULLET.cpp =================================================================== ---- 7kaa-2.14.5.orig/src/client/OBULLET.cpp -+++ 7kaa-2.14.5/src/client/OBULLET.cpp +--- a/src/OBULLET.cpp ++++ b/src/OBULLET.cpp @@ -38,9 +38,9 @@ const int SCAN_RANGE = SCAN_RADIUS * 2 + // from the closet to the far @@ -22,10 +22,10 @@ //--------- Begin of function Bullet::Bullet -------// -Index: 7kaa-2.14.5/src/client/OGAMMAIN.cpp +Index: a/src/OGAMMAIN.cpp =================================================================== ---- 7kaa-2.14.5.orig/src/client/OGAMMAIN.cpp -+++ 7kaa-2.14.5/src/client/OGAMMAIN.cpp +--- a/src/OGAMMAIN.cpp ++++ b/src/OGAMMAIN.cpp @@ -671,7 +671,7 @@ void Game::multi_player_menu(int lobbied static char multi_player_option_flag[MULTI_PLAYER_OPTION_COUNT] = @@ -35,10 +35,10 @@ }; game_mode = GAME_MULTI_PLAYER; -Index: 7kaa-2.14.5/src/client/OUNITAAT.cpp +Index: a/src/OUNITAAT.cpp =================================================================== ---- 7kaa-2.14.5.orig/src/client/OUNITAAT.cpp -+++ 7kaa-2.14.5/src/client/OUNITAAT.cpp +--- a/src/OUNITAAT.cpp ++++ b/src/OUNITAAT.cpp @@ -1513,8 +1513,8 @@ void UnitArray::arrange_units_in_group(i // int UnitArray::analyse_surround_location(int targetXLoc, int targetYLoc, int targetWidth, int targetHeight, char mobileType) @@ -65,10 +65,10 @@ err_when(targetWidth<1 || targetWidth>4); Location *locPtr; -Index: 7kaa-2.14.5/src/client/OUNITATB.cpp +Index: a/src/OUNITATB.cpp =================================================================== ---- 7kaa-2.14.5.orig/src/client/OUNITATB.cpp -+++ 7kaa-2.14.5/src/client/OUNITATB.cpp +--- a/src/OUNITATB.cpp ++++ b/src/OUNITATB.cpp @@ -45,294 +45,294 @@ //------------------------------------------------------------------------------// @@ -620,10 +620,10 @@ //--------- Begin of function UnitArray::get_target_x_offset ---------// // return x offset -Index: 7kaa-2.14.5/src/client/OU_MARI.cpp +Index: a/src/OU_MARI.cpp =================================================================== ---- 7kaa-2.14.5.orig/src/client/OU_MARI.cpp -+++ 7kaa-2.14.5/src/client/OU_MARI.cpp +--- a/src/OU_MARI.cpp ++++ b/src/OU_MARI.cpp @@ -552,7 +552,7 @@ int UnitMarine::is_on_coast() //--------- Begin of function UnitMarine::extra_move ---------// void UnitMarine::extra_move()
