commit 7kaa for openSUSE:Factory

2020-07-17 Thread root 
Hello community,

here is the log from the commit of package 7kaa for openSUSE:Factory checked in 
at 2020-07-17 20:50:40

Comparing /work/SRC/openSUSE:Factory/7kaa (Old)
 and  /work/SRC/openSUSE:Factory/.7kaa.new.3592 (New)


Package is "7kaa"

Fri Jul 17 20:50:40 2020 rev:8 rq:821419 version:2.15.4p1

Changes:

--- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes2020-03-30 
23:07:13.832307329 +0200
+++ /work/SRC/openSUSE:Factory/.7kaa.new.3592/7kaa.changes  2020-07-17 
20:51:29.000959922 +0200
@@ -1,0 +2,31 @@
+Sun Jul 12 15:49:42 UTC 2020 - Carsten Ziepke 
+
+- Update to 2.15.4p1
+  * This is a patch release to fix a few issues with 2.15.4.
+All users should upgrade.
+- Update to 2.15.4
+  * Fixed a problem in multiplayer that halted the game play.
+  * Added option to play with the original seven kingdoms, and
+enabled on original scenarios.
+  * Apply the leadership bonus when the general is in fort for
+defending soldiers in range.
+  * Fixed the mobile general range calculation for the leadership
+bonus to not apply to the troop anywhere on the map.
+  * Apply the leadership bonus when the general is on a ship for
+defending soldiers in range.
+  * Updated translations.
+  * Added hotkeys for managing the build menu in the War Factory,
+Harbor, and Town.
+  * Restored support for real full screen resolution that requires
+a screen mode change.
+  * Improved dynamic UI button and text layout.
+  * Added Polish translation.
+  * Added trade locations to the trade report.
+  * Sort and filter trade locations based on the map selected
+caravan.
+  * Allow setting stops using the trade report.
+  * Allow copying trade routes using the trade report.
+- Add 7kaa-no-return-in-nonvoid-function.patch
+- Clean with spec-cleaner
+
+---

Old:

  7kaa-2.15.3.tar.xz

New:

  7kaa-2.15.4p1.tar.xz
  7kaa-no-return-in-nonvoid-function.patch



Other differences:
--
++ 7kaa.spec ++
--- /var/tmp/diff_new_pack.LToLUv/_old  2020-07-17 20:51:31.212962230 +0200
+++ /var/tmp/diff_new_pack.LToLUv/_new  2020-07-17 20:51:31.216962234 +0200
@@ -16,19 +16,20 @@
 #
 
 
-# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
 Name:   7kaa
-Version:2.15.3
+Version:2.15.4p1
 Release:0
 Summary:Seven Kingdoms: Ancient Adversaries
 License:GPL-2.0-only
 Group:  Amusements/Games/Strategy/Real Time
-URL:http://7kfans.com/
+URL:https://7kfans.com/
 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
+# PATCH-FIX-UPSTREAM - 7kaa-no-return-in-nonvoid-function.patch -- 
gh#the3dfxdude/7kaa#192
+Patch1: 7kaa-no-return-in-nonvoid-function.patch
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -59,11 +60,12 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 %configure --docdir=%{_docdir}/%{name}
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install

++ 7kaa-no-return-in-nonvoid-function.patch ++
diff -Nur 7kaa-2.15.4p1/include/OFIRM.h new/include/OFIRM.h
--- 7kaa-2.15.4p1/include/OFIRM.h   2020-07-11 04:47:28.0 +0200
+++ new/include/OFIRM.h 2020-07-13 17:12:35.540867933 +0200
@@ -322,7 +322,7 @@
  void detect_info_both();
 
virtual void put_info(int refreshFlag)  {;}
-   virtual int  detect_info()  
{;}
+   virtual int  detect_info()  
{return 0;}
  void sort_worker();
 
  void process_animation();

commit 7kaa for openSUSE:Factory

2020-03-30 Thread root 
Hello community,

here is the log from the commit of package 7kaa for openSUSE:Factory checked in 
at 2020-03-30 23:07:06

Comparing /work/SRC/openSUSE:Factory/7kaa (Old)
 and  /work/SRC/openSUSE:Factory/.7kaa.new.3160 (New)


Package is "7kaa"

Mon Mar 30 23:07:06 2020 rev:7 rq:789825 version:2.15.3

Changes:

--- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes2019-02-28 
21:42:05.08555 +0100
+++ /work/SRC/openSUSE:Factory/.7kaa.new.3160/7kaa.changes  2020-03-30 
23:07:13.832307329 +0200
@@ -1,0 +2,29 @@
+Fri Mar 27 09:34:45 UTC 2020 - Christophe Giboudeaux 
+
+- Update to 2.15.3. Changes since 2.15.2:
+  * Fixed corrupt characters and fields in various in game messages.
+  * Improved translation support.
+  * Updated translations.
+  * Added some UI improvements.
+  * Fixed some crashing issues related to spies.
+  * Standardized on FPU code generation for better cross-platform
+compatibility.
+  * Added more advanced config options.
+  * Improved manual.
+  * Added key binding support.
+  * Prevented chat keystrokes registering as a hotkey too.
+  * Fixed sometimes hiring wrong unit in the inn.
+  * Added scenario advanced config presets to restore default
+scenario game play to original game design parameters.
+  * Ensure screen redraw when dropping spy identity.
+  * Improved alternate font set.
+  * Added scroll button for long tutor messages.
+  * Removed gong sound for unsent AI diplomatic messages.
+  * Re-enabled AI ability to request direct military aid;
+expect allied AI to work together on defending now.
+  * Removed uninitialized parameter in Caravan CRC check.
+  * Removed improper variable-size cast, causing incorrect
+action processing on 64-bit platforms.
+  * Correct replay initialization for weather sync.
+
+---

Old:

  7kaa-2.15.1.tar.xz

New:

  7kaa-2.15.3.tar.xz



Other differences:
--
++ 7kaa.spec ++
--- /var/tmp/diff_new_pack.e3N0VY/_old  2020-03-30 23:07:15.352308195 +0200
+++ /var/tmp/diff_new_pack.e3N0VY/_new  2020-03-30 23:07:15.356308198 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package 7kaa
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 # See also http://en.opensuse.org/openSUSE:Specfile_guidelines
 Name:   7kaa
-Version:2.15.1
+Version:2.15.3
 Release:0
 Summary:Seven Kingdoms: Ancient Adversaries
 License:GPL-2.0-only

++ 7kaa-2.15.1.tar.xz -> 7kaa-2.15.3.tar.xz ++
/work/SRC/openSUSE:Factory/7kaa/7kaa-2.15.1.tar.xz 
/work/SRC/openSUSE:Factory/.7kaa.new.3160/7kaa-2.15.3.tar.xz differ: char 26, 
line 1

commit 7kaa for openSUSE:Factory

2019-02-28 Thread root 
Hello community,

here is the log from the commit of package 7kaa for openSUSE:Factory checked in 
at 2019-02-28 21:41:33

Comparing /work/SRC/openSUSE:Factory/7kaa (Old)
 and  /work/SRC/openSUSE:Factory/.7kaa.new.28833 (New)


Package is "7kaa"

Thu Feb 28 21:41:33 2019 rev:6 rq:677701 version:2.15.1

Changes:

--- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes2017-11-10 
14:56:23.510260431 +0100
+++ /work/SRC/openSUSE:Factory/.7kaa.new.28833/7kaa.changes 2019-02-28 
21:42:05.08555 +0100
@@ -1,0 +2,28 @@
+Tue Feb 19 20:32:22 UTC 2019 - Matthias Eliasson 
+
+- Update to 2.15.1 
+  * Fixed desync on mobilizing workers.
+  * Fixed desync on troop sortie, by making troop sorting deterministic.
+  * Fixed desync on AI attack planning, by making AI fort sorting 
deterministic.
+  * Fixed error that caused multiplayer save files appear out of sync.
+  * Changed the Button class to not block on holding down the mouse button,
+smoothing multiplayer games when alot of clicking may be happening.
+  * Prevent mobilizing foreign workers from your Firms, however they may be
+fired back to their home town.
+  * Only enable mobilize worker button when the firm is staffed with 
non-foreign
+workers.
+  * Prefer IPv4 addressing for 7kfans.com match-making.
+  * Fixed ambiguity in some translations.
+  * Repack structures for Crc checking due to pointer sizing.
+  * Improved cross-compilation and platform support.
+  * Uppercased the data and user files, as they are supported in the code,
+maintaining consistency and without needing to guess case.
+  * Fixed missing Fryhtan encyclopedia picture on some systems.
+  * Fixed observation mode visibility when playing a replay.
+  * Added support for center and right paragraph justification.
+  * Packagers please note that the music files must be in upper-case now, see
+the latest download for the music.
+- Clean with spec-cleaner
+- Make sure we recommend new 7kaa-music version
+
+---

Old:

  7kaa-2.14.7.tar.xz

New:

  7kaa-2.15.1.tar.xz



Other differences:
--
++ 7kaa.spec ++
--- /var/tmp/diff_new_pack.e5F3ke/_old  2019-02-28 21:42:06.253558389 +0100
+++ /var/tmp/diff_new_pack.e5F3ke/_new  2019-02-28 21:42:06.257558387 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package 7kaa
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,32 +12,32 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 # See also http://en.opensuse.org/openSUSE:Specfile_guidelines
 Name:   7kaa
-Version:2.14.7
+Version:2.15.1
 Release:0
 Summary:Seven Kingdoms: Ancient Adversaries
-License:GPL-2.0
+License:GPL-2.0-only
 Group:  Amusements/Games/Strategy/Real Time
-Url:http://7kfans.com/
+URL:http://7kfans.com/
 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(libenet)
+BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
-Recommends: %{name}-music
+Recommends: %{name}-music >= 20181228
 
 %description
 Seven Kingdoms made departures from the traditional real-time strategy models
@@ -76,9 +76,14 @@
 
 %suse_update_desktop_file %{name}
 %fdupes -s %{buildroot}%{_prefix}
+%find_lang %{name}
 
-%files
-%doc COPYING README
+# remove duplicate COPYING file
+rm -f %{buildroot}%{_docdir}/7kaa/COPYING
+
+%files -f %{name}.lang
+%license COPYING
+%doc README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png

++ 7kaa-2.14.7.tar.xz -> 7kaa-2.15.1.tar.xz ++
/work/SRC/openSUSE:Factory/7kaa/7kaa-2.14.7.tar.xz 
/work/SRC/openSUSE:Factory/.7kaa.new.28833/7kaa-2.15.1.tar.xz differ: char 25, 
line 1

commit 7kaa for openSUSE:Factory

2017-11-10 Thread root 
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.changes2016-10-13 
11:27:55.0 +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 - aavind...@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
+
+---

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

commit 7kaa for openSUSE:Factory

2016-10-13 Thread h_root 
Hello community,

here is the log from the commit of package 7kaa for openSUSE:Factory checked in 
at 2016-10-13 11:27:54

Comparing /work/SRC/openSUSE:Factory/7kaa (Old)
 and  /work/SRC/openSUSE:Factory/.7kaa.new (New)


Package is "7kaa"

Changes:

--- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes2016-06-19 
11:08:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.7kaa.new/7kaa.changes   2016-10-13 
11:27:55.0 +0200
@@ -1,0 +2,20 @@
+Mon Sep  5 17:54:01 UTC 2016 - nemy...@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
+
+---

Old:

  7kaa-2.14.5.patch
  7kaa-2.14.5.tar.bz2
  7kaa-2.14.5_overflow.patch

New:

  7kaa-2.14.6.tar.xz



Other differences:
--
++ 7kaa.spec ++
--- /var/tmp/diff_new_pack.t372lK/_old  2016-10-13 11:28:01.0 +0200
+++ /var/tmp/diff_new_pack.t372lK/_new  2016-10-13 11:28:01.0 +0200
@@ -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 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"
@@ -81,13 +74,11 @@
 # 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

commit 7kaa for openSUSE:Factory

2016-06-19 Thread h_root 
Hello community,

here is the log from the commit of package 7kaa for openSUSE:Factory checked in 
at 2016-06-19 11:08:28

Comparing /work/SRC/openSUSE:Factory/7kaa (Old)
 and  /work/SRC/openSUSE:Factory/.7kaa.new (New)


Package is "7kaa"

Changes:

--- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes2015-10-06 
13:24:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.7kaa.new/7kaa.changes   2016-06-19 
11:08:52.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun 16 14:03:33 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- new gcc6_char_cast.patch proposal for upstream issue
+  https://github.com/the3dfxdude/7kaa/issues/63
+
+---

New:

  gcc6_char_cast.patch



Other differences:
--
++ 7kaa.spec ++
--- /var/tmp/diff_new_pack.Agse9B/_old  2016-06-19 11:08:53.0 +0200
+++ /var/tmp/diff_new_pack.Agse9B/_new  2016-06-19 11:08:53.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package 7kaa
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -30,6 +30,7 @@
 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
 Source1:%{name}.png
 Source2:%{name}.desktop
 %if 0%{?suse_version}
@@ -64,6 +65,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"


++ gcc6_char_cast.patch ++
 646 lines (skipped)

commit 7kaa for openSUSE:Factory

2015-10-06 Thread h_root 
Hello community,

here is the log from the commit of package 7kaa for openSUSE:Factory checked in 
at 2015-10-06 13:24:40

Comparing /work/SRC/openSUSE:Factory/7kaa (Old)
 and  /work/SRC/openSUSE:Factory/.7kaa.new (New)


Package is "7kaa"

Changes:

--- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes2014-11-11 
01:11:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.7kaa.new/7kaa.changes   2015-10-06 
13:24:44.0 +0200
@@ -1,0 +2,28 @@
+Tue Sep 29 15:06:37 UTC 2015 - opens...@dstoecker.de
+
+- patch buffer overflow (7kaa-2.14.5_overflow.patch)
+
+---
+Fri Sep 25 18:32:04 UTC 2015 - nemy...@opensuse.org
+
+- Update to 2.14.5, announce message:
+
+ * Switched to using SDL2.
+ * Gained support for full-screen stretching.
+ * Gained support for MacOS.
+ * Switched to using enet, replacing SDL_net.
+ * Audio code improvements.
+ * The multiplayer connection code has stablized.
+ * New game hotkeys.
+ * Migrate population across extended town networks.
+ * Added ability to migrate 10 people at a time across between towns.
+ * Gettext translation support.
+ * Several bug fixes.
+
+- Add patch 7kaa-2.14.5.patch, - fix build
+- Remove BuildRequires for desktop-file-utils
+- Add BuildRequires, changed by Upstream for enet-devel and sdl2
+- Remove BuildRequires, changed by Upstream for SDL_net and sdl
+- Fix build with gcc5, add CXXFLAGS="%{optflags} -fno-strict-aliasing"
+
+---

Old:

  7kaa-source-2.14.4.tar.bz2

New:

  7kaa-2.14.5.patch
  7kaa-2.14.5.tar.bz2
  7kaa-2.14.5_overflow.patch



Other differences:
--
++ 7kaa.spec ++
--- /var/tmp/diff_new_pack.HujgLE/_old  2015-10-06 13:24:46.0 +0200
+++ /var/tmp/diff_new_pack.HujgLE/_new  2015-10-06 13:24:46.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package 7kaa
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -19,25 +19,29 @@
 # See also http://en.opensuse.org/openSUSE:Specfile_guidelines
 
 Name:   7kaa
-Version:2.14.4
+Version:2.14.5
 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}-source-%{version}.tar.bz2
+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
 Source1:%{name}.png
 Source2:%{name}.desktop
 %if 0%{?suse_version}
-BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
 %endif
+BuildRequires:  enet-devel
 BuildRequires:  gcc-c++
 BuildRequires:  openal-soft-devel
-BuildRequires:  pkgconfig(SDL_net)
-BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(sdl2)
 Recommends: %{name}-music
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 Seven Kingdoms made departures from the traditional real-time strategy models
@@ -58,8 +62,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 %configure --docdir=%{_docdir}/%{name}
 make %{?_smp_mflags}
 
@@ -73,12 +80,12 @@
 install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %if 0%{?suse_version}
-%suse_update_desktop_file %{name}
-%fdupes %{buildroot}%{_prefix}
+%suse_update_desktop_file %{name}
+%fdupes -s %{buildroot}%{_prefix}
 %endif
 
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc COPYING README
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop

++ 7kaa-2.14.5.patch ++
diff -ruB 7kaa-2.14.5.orig/src/client/OFIRMIF.cpp 
7kaa-2.14.5/src/client/OFIRMIF.cpp
--- 7kaa-2.14.5.orig/src/client/OFIRMIF.cpp 2015-05-19 03:00:20.0 
+0200
+++ 7kaa-2.14.5/src/client/OFIRMIF.cpp  2015-09-25 16:23:43.405735779 +0200
@@ -491,7 +491,7 @@
x = INFO_X1+6+i%4*50;
y = pop_disp_y1+1+i/4*29;
 
-   switch( mouse.single_click(x, y, x+27, y+23, 2) )
+   switch( mouse.any_click(x, y, x+27, y+23, LEFT_BUTTON) ? 1 : 
(mouse.any_click(x, y, x+27, y+23, RIGHT_BUTTON) ? 2 : 0) )