From a3c021322ff57840058dfe088b1b214dac11fdfd Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen@redhat.com>
Date: Dec 07 2017 15:17:38 +0000
Subject: Upstream update to 2.14.7


---

diff --git a/.gitignore b/.gitignore
index 35bebfd..68f1a03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /7kaa-formatSecurity.patch
 /7kaa.autodlrc
 /7kaa-2.14.6.tar.xz
+/7kaa-2.14.7.tar.xz
diff --git a/7kaa-formatSecurity.patch b/7kaa-formatSecurity.patch
deleted file mode 100644
index 7af2331..0000000
--- a/7kaa-formatSecurity.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -up ./src/client/ORACERES.cpp.libintl ./src/client/ORACERES.cpp
---- ./src/client/ORACERES.cpp.libintl	2015-05-19 11:00:20.000000000 +1000
-+++ ./src/client/ORACERES.cpp	2015-05-31 23:48:19.960448911 +1000
-@@ -27,7 +27,7 @@
- #include <OUNITRES.h>
- #include <ORACERES.h>
- #include <locale.h>
--#include "gettext.h"
-+#include <gettext.h>
- 
- //---------- #define constant ------------//
- 
-@@ -540,52 +540,52 @@ static void translate_race_adjective(cha
- 	if( strncmp(adjective, "Norman", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Norman Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Norman") );
-+		strncpy( adjective, pgettext("Race Adjective", "Norman"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Mayan", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Mayan Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Mayan") );
-+		strncpy( adjective, pgettext("Race Adjective", "Mayan"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Greek", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Greek Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Greek") );
-+		strncpy( adjective, pgettext("Race Adjective", "Greek"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Viking", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Viking Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Viking") );
-+		strncpy( adjective, pgettext("Race Adjective", "Viking"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Persian", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Persian Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Persian") );
-+		strncpy( adjective, pgettext("Race Adjective", "Persian"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Chinese", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Chinese Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Chinese") );
-+		strncpy( adjective, pgettext("Race Adjective", "Chinese"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Japanese", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Japanese Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Japanese") );
-+		strncpy( adjective, pgettext("Race Adjective", "Japanese"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Egyptian", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Egyptian Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Egyptian") );
-+		strncpy( adjective, pgettext("Race Adjective", "Egyptian"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Mughul", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Mughul Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Mughul") );
-+		strncpy( adjective, pgettext("Race Adjective", "Mughul"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- 	else if( strncmp(adjective, "Zulu", RaceInfo::ADJECTIVE_LEN) == 0 )
- 	{
- 		// TRANSLATORS: "the Zulu Scroll of Power"
--		snprintf( adjective, RaceInfo::ADJECTIVE_LEN+1, pgettext("Race Adjective", "Zulu") );
-+		strncpy( adjective, pgettext("Race Adjective", "Zulu"), RaceInfo::ADJECTIVE_LEN+1 );
- 	}
- }
- //---------- End of function translate_race_adjective -----------//
diff --git a/7kaa.spec b/7kaa.spec
index bb25a97..d323998 100644
--- a/7kaa.spec
+++ b/7kaa.spec
@@ -1,8 +1,8 @@
 %global icon_file 7kaa_icon.png
 %global icon_dest_dir %{_datadir}/icons/hicolor/32x32/apps
 Name:     7kaa
-Version:  2.14.6
-Release:  4%{?dist}
+Version:  2.14.7
+Release:  1%{?dist}
 Summary:  Seven Kingdoms: Ancient Adversaries
 
 License:  GPLv3+ and GPLv2+
@@ -16,7 +16,10 @@ BuildRequires: openal-soft-devel, autoconf
 BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 BuildRequires: ImageMagick
+BuildRequires: libcurl-devel
+
 Requires: %{name}-data = %{version}-%{release}
+Requires: libcurl
 
 %description
 Seven Kingdoms is a real-time strategy (RTS) computer game developed
@@ -153,6 +156,11 @@ fi
 %dir %{_docdir}/%{name}-music
 
 %changelog
+* Thu Dec 07 2017 Ding-Yi Chen <dchen@redhat.com> - 2.14.7-1
+- Upstream update to 2.14.7
+  Fixes Bug 1458610 - 7kaa-2.14.7 is available
+- Add Requires and BuildRequires libcurl
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 8a46102..83c7261 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (7kaa-2.14.6.tar.xz) = 845ce121957959b122a29173b2c52fa6d93a62b25b90f623e683f340d3ab52fc12cc64ef40d866ae44d9de27b5b0028d23c7437ff3b7026edf3879883492e27e
-SHA512 (7kaa.autodlrc) = 9ae5ca2bdb77c49114490996eeebbced45283f938d9cc330a381bba1e3a26ffdabd899925a88f11d1f2fc7616afbd3951853b1e3b72399f9bc9b2b20149a8bdd
+SHA512 (7kaa-2.14.7.tar.xz) = 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1