Accepting request 789278 from games

OBS-URL: https://build.opensuse.org/request/show/789278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freeciv?expand=0&rev=8

fix-qt5-detection.patch

@@ -1,13 +0,0 @@
---- m4/qt5.m4.orig	2015-03-16 15:29:47.800729769 +0100
-+++ m4/qt5.m4	2015-03-16 15:41:35.044747937 +0100
-@@ -114,8 +114,8 @@
- 
- dnl If $1 is Qt 5's moc command then $2 else $3
- AC_DEFUN([FC_QT5_IF_QT5_MOC],
--  AS_IF([test "`$1 -v 2<&1 | grep -o 'Qt [[[0-9]]]\+'`" = "Qt 5" ||
--         test "`$1 -v 2<&1 | grep -o 'moc [[[0-9]]]\+'`" = "moc 5" ],
-+  AS_IF([test "`$1 -v 2<&1 | grep -o 'Qt 5\+'`" = "Qt 5" ||
-+         test "`$1 -v 2<&1 | grep -o $1' 5\+'`" = "$1 5" ],
-     [$2], [$3]))
- 
- dnl Set MOCCMD to $1 if it is the Qt 5 "moc". If not run $2 parameter.

freeciv-2.6.0.tar.bz2

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

freeciv-2.6.2.tar.bz2

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

freeciv.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 27 14:56:42 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 2.6.2. New bugfix release.
+  See https://freeciv.fandom.com/wiki/NEWS-2.6.2 for the complete
+  list of changes.
+- Drop fix-qt5-detection.patch. No longer needed.
+
 -------------------------------------------------------------------
 Wed Jul 10 16:35:37 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
 

freeciv.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package freeciv
 #
-# 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
@@ -17,7 +17,7 @@
 
 
 Name:           freeciv
-Version:        2.6.0
+Version:        2.6.2
 Release:        0
 Summary:        Free Civilization Clone
 License:        GPL-2.0-or-later
@@ -31,8 +31,6 @@ Source4:        freeciv-manual
 Source5:        freeciv-manual.desktop
 Source6:        freeciv-manual.png
 Patch0:         freeciv-appdata-desktop-references.patch
-Patch1:         fix-qt5-detection.patch
-BuildRequires:  SDL_mixer-devel
 BuildRequires:  audiofile-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -45,9 +43,12 @@ BuildRequires:  libggz2-devel
 BuildRequires:  libqt5-qtbase-common-devel
 BuildRequires:  libqt5-qtbase-devel
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xz-devel
+BuildRequires:  pkgconfig(SDL2_mixer)
+BuildRequires:  pkgconfig(sdl2)
 Requires:       freeciv_client-%{version}
 Recommends:     freeciv-lang
 
@@ -90,7 +91,6 @@ Freeciv executable using Gtk3 library
 %prep
 %setup -q
 %patch0 -p1
-%patch1
 
 %build
 export MOCCMD="moc-qt5"