Accepting request 539002 from home:avindra

- 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

OBS-URL: https://build.opensuse.org/request/show/539002
OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=18

7kaa-2.14.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fcbe2d7fc12fab7a2c08a14317264c9f96a6ebca18b28f3fee78925442bdd573
-size 31220676

7kaa-2.14.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9425cfb7f11a915e82d4696649db35a4d53969a9479a4705b403206df462e543
+size 31342092

7kaa.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Nov  4 19:40:35 UTC 2017 - aavindraa@gmail.com
+
+- 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
+
 -------------------------------------------------------------------
 Mon Sep  5 17:54:01 UTC 2016 - nemysis@openSUSE.org
 

7kaa.spec

@@ -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
+Source0:        https://github.com/the3dfxdude/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM - gcc6_char_cast.patch -- https://github.com/the3dfxdude/7kaa/issues/63
-Patch0:         gcc6_char_cast.patch
 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 %{?_smp_mflags}
 %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

gcc6_char_cast.patch

@@ -1,15 +1,15 @@
 ---
- src/client/OBULLET.cpp  |    4 
+ src/OBULLET.cpp  |    4 
- src/client/OGAMMAIN.cpp |    2 
+ src/OGAMMAIN.cpp |    2 
- src/client/OUNITAAT.cpp |   12 -
+ src/OUNITAAT.cpp |   12 -
- src/client/OUNITATB.cpp |  512 ++++++++++++++++++++++++------------------------
+ src/OUNITATB.cpp |  512 ++++++++++++++++++++++++------------------------
- src/client/OU_MARI.cpp  |    6 
+ 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
+--- a/src/OBULLET.cpp
-+++ 7kaa-2.14.5/src/client/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 @@ Index: 7kaa-2.14.5/src/client/OBULLET.cpp
  
  //--------- 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
+--- a/src/OGAMMAIN.cpp
-+++ 7kaa-2.14.5/src/client/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 @@ Index: 7kaa-2.14.5/src/client/OGAMMAIN.cpp
  	};
  
  	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
+--- a/src/OUNITAAT.cpp
-+++ 7kaa-2.14.5/src/client/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 @@ Index: 7kaa-2.14.5/src/client/OUNITAAT.cpp
  
  	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
+--- a/src/OUNITATB.cpp
-+++ 7kaa-2.14.5/src/client/OUNITATB.cpp
++++ b/src/OUNITATB.cpp
 @@ -45,294 +45,294 @@
  //------------------------------------------------------------------------------//
  
@@ -620,10 +620,10 @@ Index: 7kaa-2.14.5/src/client/OUNITATB.cpp
  
  //--------- 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
+--- a/src/OU_MARI.cpp
-+++ 7kaa-2.14.5/src/client/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()