From 9ef87cba34aa78a7f17303acf4aca6f50dbad55a27e4febf288cc0a638c84ad3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Dec 2020 10:41:13 +0000 Subject: [PATCH] Accepting request 858077 from home:dirkmueller:branches:games - update to 2.6.2.1: * Fixed server crash when unit with zero move_rate is transformed * Fixed crashes when using Direction objects in lua scripts * Fixed crash when chatline text had opening tag without closing tag * Fixes to the Qt client * Updated translations * Fixed Qt-client build against Qt-5.15 (removes freeciv-qt-5.15.patch ) * Documentation updates OBS-URL: https://build.opensuse.org/request/show/858077 OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=59 --- freeciv-2.6.2.1.tar.bz2 | 3 +++ freeciv-2.6.2.tar.bz2 | 3 --- freeciv-qt-5.15.patch | 42 ----------------------------------------- freeciv.changes | 12 ++++++++++++ freeciv.spec | 8 ++++---- 5 files changed, 19 insertions(+), 49 deletions(-) create mode 100644 freeciv-2.6.2.1.tar.bz2 delete mode 100644 freeciv-2.6.2.tar.bz2 delete mode 100644 freeciv-qt-5.15.patch diff --git a/freeciv-2.6.2.1.tar.bz2 b/freeciv-2.6.2.1.tar.bz2 new file mode 100644 index 0000000..caeb531 --- /dev/null +++ b/freeciv-2.6.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd04ac03c1505582309dd62bcc4710002a3cfb4b2b38c28af33047dd2fb7585e +size 52216084 diff --git a/freeciv-2.6.2.tar.bz2 b/freeciv-2.6.2.tar.bz2 deleted file mode 100644 index 16f36e8..0000000 --- a/freeciv-2.6.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f -size 52139007 diff --git a/freeciv-qt-5.15.patch b/freeciv-qt-5.15.patch deleted file mode 100644 index d686001..0000000 --- a/freeciv-qt-5.15.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a797ed79bd85d25cd4a75d3e7c51d9363582d3d6 Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist -Date: Tue, 7 Apr 2020 13:22:14 +0300 -Subject: [PATCH 2/2] Include where needed - -This fixes Qt-client build on OpenEmbedded - -See hrm Bug #868060 - -Signed-off-by: Marko Lindqvist ---- - client/gui-qt/canvas.cpp | 1 + - client/gui-qt/dialogs.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp -index 24291bc183..00fa1b8f52 100644 ---- a/client/gui-qt/canvas.cpp -+++ b/client/gui-qt/canvas.cpp -@@ -18,6 +18,7 @@ - // Qt - #include - #include -+#include - - // qt-client - #include "canvas.h" -diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp -index e0f9de31d4..4b3254c496 100644 ---- a/client/gui-qt/dialogs.cpp -+++ b/client/gui-qt/dialogs.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/freeciv.changes b/freeciv.changes index 9165522..c1bcb7a 100644 --- a/freeciv.changes +++ b/freeciv.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 22 09:03:17 UTC 2020 - Dirk Müller + +- update to 2.6.2.1: + * Fixed server crash when unit with zero move_rate is transformed + * Fixed crashes when using Direction objects in lua scripts + * Fixed crash when chatline text had opening tag without closing tag + * Fixes to the Qt client + * Updated translations + * Fixed Qt-client build against Qt-5.15 (removes freeciv-qt-5.15.patch ) + * Documentation updates + ------------------------------------------------------------------- Thu Jun 4 15:47:41 UTC 2020 - Dominique Leuenberger diff --git a/freeciv.spec b/freeciv.spec index 84e5dd8..f18a779 100644 --- a/freeciv.spec +++ b/freeciv.spec @@ -17,7 +17,7 @@ Name: freeciv -Version: 2.6.2 +Version: 2.6.2.1 Release: 0 Summary: Free Civilization Clone License: GPL-2.0-or-later @@ -31,7 +31,6 @@ Source4: freeciv-manual Source5: freeciv-manual.desktop Source6: freeciv-manual.png Patch0: freeciv-appdata-desktop-references.patch -Patch1: freeciv-qt-5.15.patch BuildRequires: audiofile-devel BuildRequires: autoconf BuildRequires: automake @@ -47,6 +46,7 @@ BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: update-desktop-files BuildRequires: xz-devel +BuildRequires: zlib-devel BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(sdl2) Requires: freeciv_client-%{version} @@ -72,6 +72,7 @@ Provides: freeciv_client-%{version} Freeciv executable using Qt library %package lang +# FIXME: consider using %%lang_package macro Summary: Translation files for freeciv Group: Amusements/Games/Strategy/Turn Based Requires: freeciv = %{version} @@ -91,7 +92,6 @@ Freeciv executable using Gtk3 library %prep %setup -q %patch0 -p1 -%patch1 -p1 %build export MOCCMD="moc-qt5" @@ -101,7 +101,7 @@ autoreconf -fi --with-readline \ --disable-static \ --docdir=%{_docdir}/freeciv -make %{?_smp_mflags} +%make_build %install %make_install