diff --git a/freeciv-2.6.2.1.tar.bz2 b/freeciv-2.6.2.1.tar.bz2 deleted file mode 100644 index caeb531..0000000 --- a/freeciv-2.6.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd04ac03c1505582309dd62bcc4710002a3cfb4b2b38c28af33047dd2fb7585e -size 52216084 diff --git a/freeciv-2.6.3.tar.bz2 b/freeciv-2.6.3.tar.bz2 new file mode 100644 index 0000000..139d73d --- /dev/null +++ b/freeciv-2.6.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77432e027557a9eb407dac730ae9810ee172abe37111deb017fe72b8183ff8d1 +size 52098842 diff --git a/freeciv-appdata-desktop-references.patch b/freeciv-appdata-desktop-references.patch deleted file mode 100644 index 157d470..0000000 --- a/freeciv-appdata-desktop-references.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 @@ - - - Freeciv gtk+-3 client -- freeciv.desktop -+ freeciv-gtk3.desktop - CC0 - Gtk+-3 based client for the Freeciv game - -Nur in freeciv-2.6.0_fix/bootstrap: freeciv-gtk3.appdata.xml.in~. diff --git a/freeciv.changes b/freeciv.changes index c1bcb7a..107eecd 100644 --- a/freeciv.changes +++ b/freeciv.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Sat Jan 30 11:25:57 UTC 2021 - Dirk Müller + +- update to 2.6.3: + * see http://www.freeciv.org/wiki/NEWS-2.6.3 + * Fixed trouble when a new city is founded to the ruins of a former city, + and that new city establish a trade route with a player who had seen + former city, and is unaware that it had been destroyed HRM#871606 + * Fixed a case where shared vision did not completely update + recipient's map HRM#846106 + * Fixed a bug where one could paradrop to peaceful nation's territory + after continuing game from an old savegame HRM#879084 + * Fixed a bug causing game sometimes to tell wrong reason of why an + action failed HRM#879880 + * Cease fire no longer runs out with an already dead player, making his + former allies to hate the alive party of the treaty HRM#879055 + * Made server not to end in a infinite loop after loading savegame with + too high phase number. Such a savegame was reported to be created + after spaceship was launched but game was still continued HRM#815196 + * Unified writing of the city name Washington-on-the-Brazos + between rulesets, so it doesn't appear multiple times in the same + game in a bit different form HRM#867817 + * Stealth units are no longer erroneously hidden even from allies + HRM#764976 + * Placing initial units is now done in shuffled player order HRM#850656 + * Corrupt worker tasks are cleared. Those can originate, e.g., + from buggy pre-2.6.2.1 Qt-client, and live in old savegames HRM#901938 + * In a ruleset, such as civ2civ3, where caravans can help building wonder + in a foreign city, refresh city info of the city owner when one does + HRM#907977 + * Display of success probabilities for diplomats was off when targeting + stack of units instead of individual unit HRM#859761 + * Fixed pillaging of extras that are caused by something else than + player actions. For the fix to work, both server and client must be + at least version 2.6.3 HRM#861508 + * Civilian unit trying to paradrop to an enemy city dies HRM#870004 + * Prevented dead player from getting techs via Tech_Parasite effect. + This caused trouble in alien ruleset where Tech_Parasite is granted + by a tech HRM#873692 + * Improved support of CityTile requirement type HRM#877780 + * Fixed trouble preventing Small Wonders from working as impr_reqs + for units HRM#884993 + * Corrected success probability shown by action dialog when it depends + on a special kind of road HRM#897490 + * The included Lua engine has been upgraded from 5.3.5 to 5.3.6. HRM#889425 +- drop freeciv-appdata-desktop-references.patch (obsolete) + ------------------------------------------------------------------- Tue Dec 22 09:03:17 UTC 2020 - Dirk Müller diff --git a/freeciv.spec b/freeciv.spec index f18a779..af764aa 100644 --- a/freeciv.spec +++ b/freeciv.spec @@ -1,7 +1,7 @@ # # spec file for package freeciv # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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.2.1 +Version: 2.6.3 Release: 0 Summary: Free Civilization Clone License: GPL-2.0-or-later @@ -30,7 +30,6 @@ Source3: freeciv.png Source4: freeciv-manual Source5: freeciv-manual.desktop Source6: freeciv-manual.png -Patch0: freeciv-appdata-desktop-references.patch BuildRequires: audiofile-devel BuildRequires: autoconf BuildRequires: automake @@ -91,7 +90,6 @@ Freeciv executable using Gtk3 library %prep %setup -q -%patch0 -p1 %build export MOCCMD="moc-qt5" @@ -108,9 +106,8 @@ autoreconf -fi install -m 755 $RPM_SOURCE_DIR/freeciv-manual %{buildroot}%{_bindir} 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 -%suse_update_desktop_file -i %{name}-qt Game StrategyGame +%suse_update_desktop_file -i org.freeciv.gtk3 Game StrategyGame +%suse_update_desktop_file -i org.freeciv.qt Game StrategyGame %suse_update_desktop_file -i freeciv-manual Game StrategyGame rm %{buildroot}%{_docdir}/freeciv/COPYING @@ -133,8 +130,8 @@ rm %{buildroot}%{_docdir}/freeciv/COPYING %{_bindir}/freeciv-server %{_bindir}/freeciv-manual %{_datadir}/applications/freeciv-manual.desktop -%{_datadir}/applications/freeciv-server.desktop -%{_datadir}/applications/freeciv-ruledit.desktop +%{_datadir}/applications/org.freeciv.server.desktop +%{_datadir}/applications/org.freeciv.ruledit.desktop %{_datadir}/freeciv/ %{_datadir}/icons/hicolor/128x128/apps/freeciv-client.png %{_datadir}/icons/hicolor/128x128/apps/freeciv-server.png @@ -163,14 +160,14 @@ rm %{buildroot}%{_docdir}/freeciv/COPYING %files gtk3 %{_bindir}/freeciv-gtk3 %{_bindir}/freeciv-mp-gtk3 -%{_datadir}/applications/%{name}-gtk3.desktop +%{_datadir}/applications/org.freeciv.gtk3.desktop %{_datadir}/appdata/freeciv-gtk3.appdata.xml -%{_datadir}/applications/freeciv-mp-gtk3.desktop +%{_datadir}/applications/org.freeciv.mp.gtk3.desktop %{_datadir}/appdata/freeciv-mp-gtk3.appdata.xml %files qt %{_bindir}/freeciv-qt -%{_datadir}/applications/%{name}-qt.desktop +%{_datadir}/applications/org.freeciv.qt.desktop %{_datadir}/appdata/freeciv-qt.appdata.xml %changelog