Hello community, here is the log from the commit of package freeciv for openSUSE:Leap:15.2 checked in at 2020-03-31 07:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/freeciv (Old) and /work/SRC/openSUSE:Leap:15.2/.freeciv.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeciv" Tue Mar 31 07:23:41 2020 rev:14 rq:789557 version:2.6.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/freeciv/freeciv.changes 2020-01-15 14:55:46.309599901 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.freeciv.new.3160/freeciv.changes 2020-03-31 07:23:51.182436655 +0200 @@ -1,0 +2,33 @@ +Fri Mar 27 14:56:42 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- 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 <[email protected]> + +- update to 2.6.0, lots of changes + See https://freeciv.fandom.com/wiki/NEWS-2.6.0 + Rebase freeciv-appdata-desktop-references.patch + Cleanup build + Introduce separate freeciv-lang package + +------------------------------------------------------------------- +Fri Jun 15 20:10:21 UTC 2018 - [email protected] + +- freeciv 2.5.11: + * Stealing a future technology was accidentally yielding two of + them + * Put a message about nuclear attack in a more appropriate + category + * Some minor improvements to autogenerated terrain help + * Fix a crash with a malformed tileset + * Fix an erroneous diagnostic for a malformed savegame + * Fix a geographical error in the Cuyavian nation description + * Fix typo in ruleset help comments + * Fix some compiler warnings + * Updated translations + +------------------------------------------------------------------- Old: ---- fix-qt5-detection.patch freeciv-2.5.10.tar.bz2 New: ---- freeciv-2.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeciv.spec ++++++ --- /var/tmp/diff_new_pack.tWgj45/_old 2020-03-31 07:23:52.002437011 +0200 +++ /var/tmp/diff_new_pack.tWgj45/_new 2020-03-31 07:23:52.006437013 +0200 @@ -1,7 +1,7 @@ # # spec file for package freeciv # -# Copyright (c) 2018 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 @@ -12,32 +12,25 @@ # 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.10 +Version: 2.6.2 Release: 0 Summary: Free Civilization Clone -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Amusements/Games/Strategy/Turn Based -Url: http://www.freeciv.org +URL: http://www.freeciv.org Source0: http://files.freeciv.org/stable/%{name}-%{version}.tar.bz2 Source1: freeciv-gtk3.desktop -%if 0%{?suse_version} >= 1320 Source2: freeciv-qt.desktop -%endif Source3: freeciv.png Source4: freeciv-manual Source5: freeciv-manual.desktop Source6: freeciv-manual.png Patch0: freeciv-appdata-desktop-references.patch -%if 0%{?suse_version} >= 1320 -Patch1: fix-qt5-detection.patch -%endif -Requires: freeciv_client-%version -BuildRequires: SDL_mixer-devel BuildRequires: audiofile-devel BuildRequires: autoconf BuildRequires: automake @@ -47,15 +40,17 @@ BuildRequires: gtk3-devel BuildRequires: libbz2-devel BuildRequires: libggz2-devel -%if 0%{?suse_version} >= 1320 BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtbase-devel -%endif BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: update-desktop-files BuildRequires: xz-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(SDL2_mixer) +BuildRequires: pkgconfig(sdl2) +Requires: freeciv_client-%{version} +Recommends: freeciv-lang %description A clone of the well known game Civilization by Microprose. @@ -67,87 +62,78 @@ 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 -Provides: freeciv_client-%version -Requires: freeciv = %version +Requires: freeciv = %{version} +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 -Provides: freeciv_client-%version -Requires: freeciv = %version -Obsoletes: freeciv-gtk2 +Requires: freeciv = %{version} +Provides: freeciv_client-%{version} %description gtk3 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 make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -install -m 755 $RPM_SOURCE_DIR/freeciv-manual %{buildroot}%{_prefix}/bin +%make_install +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 -%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 -%defattr(-,root,root) +%files %doc %{_docdir}/freeciv +%doc README +%license COPYING %exclude %{_docdir}/freeciv/INSTALL* %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%{_mandir}/man6/freeciv-*.6.gz +%{_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 @@ -169,9 +155,11 @@ %{_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 -%defattr(-,root,root) %{_bindir}/freeciv-gtk3 %{_bindir}/freeciv-mp-gtk3 %{_datadir}/applications/%{name}-gtk3.desktop @@ -179,12 +167,9 @@ %{_datadir}/applications/freeciv-mp-gtk3.desktop %{_datadir}/appdata/freeciv-mp-gtk3.appdata.xml -%if 0%{?suse_version} >= 1320 %files qt -%defattr(-,root,root) %{_bindir}/freeciv-qt %{_datadir}/applications/%{name}-qt.desktop %{_datadir}/appdata/freeciv-qt.appdata.xml -%endif %changelog ++++++ freeciv-2.5.10.tar.bz2 -> freeciv-2.6.2.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/freeciv/freeciv-2.5.10.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.freeciv.new.3160/freeciv-2.6.2.tar.bz2 differ: char 11, line 1 ++++++ freeciv-appdata-desktop-references.patch ++++++ --- /var/tmp/diff_new_pack.tWgj45/_old 2020-03-31 07:23:52.034437025 +0200 +++ /var/tmp/diff_new_pack.tWgj45/_new 2020-03-31 07:23:52.038437027 +0200 @@ -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~.
