Update

OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=51
2019-07-10 17:52:21 +00:00 · 2019-07-10 17:52:21 +00:00 · 6555e7f9ab
commit 6555e7f9ab
parent 7ffa08dac4
5 changed files with 45 additions and 61 deletions
--- a/freeciv-2.5.11.tar.bz2
+++ b/freeciv-2.5.11.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c9c526952fe977cb4b302b8ccf75798fd066c6dde670f72f677fe4964259aad
-size 40940090
--- a/freeciv-2.6.0.tar.bz2
+++ b/freeciv-2.6.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c20399198d6c7d846fed9a69b02e01134ae5340a3ae0f99d1e38063ade6c999
+size 51912466
--- a/freeciv-appdata-desktop-references.patch
+++ b/freeciv-appdata-desktop-references.patch
@ -1,26 +1,13 @@
-Index: freeciv-2.5.0/bootstrap/freeciv-gtk3.appdata.xml.in
-===================================================================
--- freeciv-2.5.0.orig/bootstrap/freeciv-gtk3.appdata.xml.in
-+++ freeciv-2.5.0/bootstrap/freeciv-gtk3.appdata.xml.in
-@@ -1,7 +1,8 @@
+diff -ur freeciv-2.6.0/bootstrap/freeciv-gtk3.appdata.xml.in freeciv-2.6.0_fix/bootstrap/freeciv-gtk3.appdata.xml.in
+--- freeciv-2.6.0/bootstrap/freeciv-gtk3.appdata.xml.in	2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0_fix/bootstrap/freeciv-gtk3.appdata.xml.in	2019-07-10 18:45:57.393807989 +0200
+@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <application>
+ <component>
+     <name>Freeciv gtk+-3 client</name>
 -    <id type="desktop">freeciv.desktop</id>
 +    <id type="desktop">freeciv-gtk3.desktop</id>
-     <licence>CC0</licence>
-+    <summary>Turn-based strategy game inspired by the history of human civilization - Gtk3 client</summary>
+     <metadata_license>CC0</metadata_license>
+     <summary>Gtk+-3 based client for the Freeciv game</summary>
     <description>
-         <p>
-             Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your
-Index: freeciv-2.5.0/bootstrap/freeciv-qt.appdata.xml.in
-===================================================================
--- freeciv-2.5.0.orig/bootstrap/freeciv-qt.appdata.xml.in
-+++ freeciv-2.5.0/bootstrap/freeciv-qt.appdata.xml.in
-@@ -2,6 +2,7 @@
- <application>
-     <id type="desktop">freeciv-qt.desktop</id>
-     <licence>CC0</licence>
-+    <summary>Turn-based strategy game inspired by the history of human civilization - Qt client</summary>
-     <description>
-         <p>
-             Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your
+Nur in freeciv-2.6.0_fix/bootstrap: freeciv-gtk3.appdata.xml.in~.
--- a/freeciv.changes
+++ b/freeciv.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 10 16:35:37 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to 2.6.0, lots of changes
+  See https://freeciv.fandom.com/wiki/NEWS-2.6.0
+  Rebase freeciv-appdata-desktop-references.patch
+
 -------------------------------------------------------------------
 Fri Jun 15 20:10:21 UTC 2018 - astieger@suse.com

--- a/freeciv.spec
+++ b/freeciv.spec
@ -1,7 +1,7 @@
 #
 # spec file for package freeciv
 #
-# Copyright (c) 2018 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,12 +12,12 @@
 # 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/
 #


 Name:           freeciv
-Version:        2.5.11
+Version:        2.6.0
 Release:        0
 Summary:        Free Civilization Clone
 License:        GPL-2.0-or-later
@ -25,11 +25,13 @@ Group:          Amusements/Games/Strategy/Turn Based
 URL:            http://www.freeciv.org
 Source0:        http://files.freeciv.org/stable/%{name}-%{version}.tar.bz2
 Source1:        freeciv-gtk3.desktop
+Source2:        freeciv-qt.desktop
 Source3:        freeciv.png
 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
@ -40,21 +42,14 @@ BuildRequires:  gcc-c++
 BuildRequires:  gtk3-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libggz2-devel
+BuildRequires:  libqt5-qtbase-common-devel
+BuildRequires:  libqt5-qtbase-devel
 BuildRequires:  libtool
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xz-devel
 Requires:       freeciv_client-%{version}
-%if 0%{?suse_version} >= 1320
-Source2:        freeciv-qt.desktop
-%endif
-%if 0%{?suse_version} >= 1320
-Patch1:         fix-qt5-detection.patch
-%endif
-%if 0%{?suse_version} >= 1320
-BuildRequires:  libqt5-qtbase-common-devel
-BuildRequires:  libqt5-qtbase-devel
-%endif
+Recommends:     freeciv-lang

 %description
 A clone of the well known game Civilization by Microprose.
@ -66,7 +61,6 @@ exchange or (more often) the extinction of all other civilizations.
 To start a new game, first start the server 'civserver,' then start the
 client 'civclient'. Have fun!

-%if 0%{?suse_version} >= 1320
 %package qt
 Summary:        Qt client for freeciv
 Group:          Amusements/Games/Strategy/Turn Based
@ -75,14 +69,20 @@ Provides:       freeciv_client-%{version}

 %description qt
 Freeciv executable using Qt library
-%endif
+
+%package lang
+Summary:        Translation files for freeciv
+Group:          Amusements/Games/Strategy/Turn Based
+Requires:       freeciv = %{version}
+
+%description lang
+Translation files for freeciv main package and clients.

 %package gtk3
 Summary:        Gtk3 client for freeciv
 Group:          Amusements/Games/Strategy/Turn Based
 Requires:       freeciv = %{version}
 Provides:       freeciv_client-%{version}
-Obsoletes:      freeciv-gtk2

 %description gtk3
 Freeciv executable using Gtk3 library
@ -90,23 +90,13 @@ Freeciv executable using Gtk3 library
 %prep
 %setup -q
 %patch0 -p1
-%if 0%{?suse_version} >= 1320
 %patch1
-%endif
-echo "X-SuSE-translate=false" >> bootstrap/freeciv-server.desktop.in
-echo "X-SuSE-translate=false" >> bootstrap/freeciv-modpack.desktop.in

 %build
-%if 0%{?suse_version} >= 1320
 export MOCCMD="moc-qt5"
-%endif
 autoreconf -fi
 %configure \
-%if 0%{?suse_version} >= 1320
  --enable-client=gtk3,qt \
-%else
-  --enable-client=gtk3 \
-%endif
  --with-readline \
  --disable-static \
  --docdir=%{_docdir}/freeciv
@ -119,32 +109,31 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps/
 install -m 644 $RPM_SOURCE_DIR/*.png %{buildroot}%{_datadir}/pixmaps
 rm %{buildroot}%{_datadir}/applications/%{name}.desktop
 %suse_update_desktop_file -i %{name}-gtk3 Game StrategyGame
-%if 0%{?suse_version} >= 1320
 %suse_update_desktop_file -i %{name}-qt Game StrategyGame
-%endif
 %suse_update_desktop_file -i freeciv-manual Game StrategyGame
-%if 0%{?sles_version} == 11
-rm -rf %{buildroot}/%{_datadir}/locale/no
-%endif
+rm %{buildroot}%{_docdir}/freeciv/COPYING

 %find_lang %{name}
 %find_lang %{name}-nations
+%find_lang %{name}-ruledit
 %fdupes %{buildroot}/%{_datadir}/

-%files -f %{name}.lang -f %{name}-nations.lang
+%files
 %doc %{_docdir}/freeciv
+%doc README
+%license COPYING
 %exclude %{_docdir}/freeciv/INSTALL*
 %exclude %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_mandir}/man6/freeciv-*.6%{?ext_man}
 %dir %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/%{name}/database.lua
+%{_bindir}/freeciv-ruledit
 %{_bindir}/freeciv-server
 %{_bindir}/freeciv-manual
-#%{_bindir}/freeciv-modpack
 %{_datadir}/applications/freeciv-manual.desktop
-#%{_datadir}/applications/freeciv-modpack.desktop
 %{_datadir}/applications/freeciv-server.desktop
+%{_datadir}/applications/freeciv-ruledit.desktop
 %{_datadir}/freeciv/
 %{_datadir}/icons/hicolor/128x128/apps/freeciv-client.png
 %{_datadir}/icons/hicolor/128x128/apps/freeciv-server.png
@ -166,6 +155,9 @@ rm -rf %{buildroot}/%{_datadir}/locale/no
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/freeciv-server.appdata.xml
+%{_datadir}/appdata/freeciv-ruledit.appdata.xml
+
+%files lang -f %{name}.lang -f %{name}-nations.lang -f %{name}-ruledit.lang

 %files gtk3
 %{_bindir}/freeciv-gtk3
@ -175,11 +167,9 @@ rm -rf %{buildroot}/%{_datadir}/locale/no
 %{_datadir}/applications/freeciv-mp-gtk3.desktop
 %{_datadir}/appdata/freeciv-mp-gtk3.appdata.xml

-%if 0%{?suse_version} >= 1320
 %files qt
 %{_bindir}/freeciv-qt
 %{_datadir}/applications/%{name}-qt.desktop
 %{_datadir}/appdata/freeciv-qt.appdata.xml
-%endif

 %changelog