diff --git a/7kaa-2.14.5_overflow.patch b/7kaa-2.14.5_overflow.patch deleted file mode 100644 index fb82054..0000000 --- a/7kaa-2.14.5_overflow.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur 7kaa-2.14.5/src/client/OGAMEMP.cpp 7kaa-2.14.5_fix/src/client/OGAMEMP.cpp ---- 7kaa-2.14.5/src/client/OGAMEMP.cpp 2015-05-19 03:00:20.000000000 +0200 -+++ 7kaa-2.14.5_fix/src/client/OGAMEMP.cpp 2015-09-29 17:05:01.007513932 +0200 -@@ -4966,7 +4966,7 @@ - String str; - - snprintf(str, -- 255, -+ MAX_STR_LEN+1, - ngettext("This multiplayer saved game needs %d human players while now there is only %d human player.", - "This multiplayer saved game needs %d human players while now there are only %d human players.", - regPlayerCount), -@@ -5123,7 +5123,7 @@ - String str; - - snprintf(str, -- 255, -+ MAX_STR_LEN+1, - ngettext("This multiplayer saved game needs %d human players while now there is only %d human player.", - "This multiplayer saved game needs %d human players while now there are only %d human players.", - playerCount), -@@ -5141,7 +5141,7 @@ - { - String str; - -- snprintf(str, 255, _("This multiplayer saved game can only support %d human players while now there are %d human players. The game cannot start."), maxPlayer, playerCount); -+ snprintf(str, MAX_STR_LEN+1, _("This multiplayer saved game can only support %d human players while now there are %d human players. The game cannot start."), maxPlayer, playerCount); - - box.msg(str); - return 0; diff --git a/7kaa-2.14.6.tar.xz b/7kaa-2.14.6.tar.xz new file mode 100644 index 0000000..18ea4f7 --- /dev/null +++ b/7kaa-2.14.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcbe2d7fc12fab7a2c08a14317264c9f96a6ebca18b28f3fee78925442bdd573 +size 31220676 diff --git a/7kaa.changes b/7kaa.changes index 3e12a8f..9117f1a 100644 --- a/7kaa.changes +++ b/7kaa.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Sep 5 17:54:01 UTC 2016 - nemysis@openSUSE.org + +- Update to 2.14.6, announce message: + + * Added support for 7kfans.com match-making. + * Added LAN game browsing support. + * Added Mobilize Worker button on firms. (sraboy/Microvirus) + * Improvements to mouse acceleration. + * Fixes to mouse movement in fullscreen mode. + * Fixed a bug with 64-bit multiplayer matches. + * Begun translation work. (toaster) + * Fix character encoding with accented characters. (MicroVirus) + * Bugfixes… + +- Remove obsolete patches 7kaa-2.14.5.patch and 7kaa-2.14.5_overflow.patch, + changed by Upstream +- Add description for patch gcc6_char_cast.patch +- Remove check %if 0%{?suse_version}, because is only for openSUSE + ------------------------------------------------------------------- Thu Jun 16 14:03:33 UTC 2016 - normand@linux.vnet.ibm.com diff --git a/7kaa.spec b/7kaa.spec index 102bcde..98bae07 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -19,27 +19,22 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: 7kaa -Version: 2.14.5 +Version: 2.14.6 Release: 0 Summary: Seven Kingdoms: Ancient Adversaries License: GPL-2.0 Group: Amusements/Games/StrategyGame Url: http://7kfans.com/ -Source0: http://sourceforge.net/projects/skfans/files/7KAA%20%{version}/%{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE - 7kaa-2.14.5.patch -- https://github.com/the3dfxdude/7kaa/issues/48 -Patch0: %{name}-2.14.5.patch -# PATCH-FIX-UPSTREAM - patch buffer overflow due to wrong size assumptions -Patch1: %{name}-2.14.5_overflow.patch -Patch2: gcc6_char_cast.patch +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 Source1: %{name}.png Source2: %{name}.desktop -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: update-desktop-files -%endif BuildRequires: enet-devel +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: openal-soft-devel +BuildRequires: update-desktop-files BuildRequires: pkgconfig(sdl2) Recommends: %{name}-music BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,8 +59,6 @@ the GPL v2. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build export CXXFLAGS="%{optflags} -fno-strict-aliasing" @@ -81,13 +74,11 @@ install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/%{name}.png # install Desktop file install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop -%if 0%{?suse_version} - %suse_update_desktop_file %{name} - %fdupes -s %{buildroot}%{_prefix} -%endif +%suse_update_desktop_file %{name} +%fdupes -s %{buildroot}%{_prefix} %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop