diff --git a/freeciv-3.0.10.tar.xz b/freeciv-3.0.10.tar.xz deleted file mode 100644 index 283e23e..0000000 --- a/freeciv-3.0.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c185c8ea0d6a2e974a5ad12fb837ca3ceb9aed3e7e884355f01035f5e779d23c -size 43433812 diff --git a/freeciv-3.1.4.tar.xz b/freeciv-3.1.4.tar.xz new file mode 100644 index 0000000..08fa0c4 --- /dev/null +++ b/freeciv-3.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14999bb903c4507cc287d5a8dd1b89eee623bb41b4e01e0836567fb5f13296e4 +size 46674900 diff --git a/freeciv-gtk3.desktop b/freeciv-gtk3.desktop deleted file mode 100644 index eb74914..0000000 --- a/freeciv-gtk3.desktop +++ /dev/null @@ -1,72 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Freeciv -Name[be]=Свабодная Цывілізацыя -Name[bg]=Цивилизация -Name[eo]=Libera Civilizludo -Name[fa]=تمدن‌آزاد -Name[nso]=civ yeo e lokollogilego -Name[sv]=Friciv -Name[ven]=civ ya Mahala -Name[vi]=Freeciv -Name[zh_CN]=文明 -Name[zh_TW]=Freeciv 仿「文明帝國」遊戲 -Type=Application -GenericName=Strategy Game -GenericName[af]=Strategie Speletjie -GenericName[be]=Стратэгічная гульня -GenericName[bg]=Стратегическа Игра -GenericName[bs]=Strateška igra -GenericName[ca]=Joc d'estratègia -GenericName[cs]=Strategická hra -GenericName[da]=Strategispil -GenericName[de]=Strategiespiel -GenericName[el]=Παιχνίδι Στρατηγικής -GenericName[eo]=Strategiludo -GenericName[es]=Juego de estrategia -GenericName[et]=Strateegiamäng -GenericName[fa]=بازی استراتژیک -GenericName[fi]=Strategiapeli -GenericName[fo]=Strategispæl -GenericName[fr]=Jeu de stratégie -GenericName[he]=משחק אסטרטגיה -GenericName[hr]=Igra strategije -GenericName[hu]=stratégiai -GenericName[is]=Herkænskuleikur -GenericName[it]=Gioco di strategia -GenericName[ja]=戦略ゲーム -GenericName[lo]=ເກມກົນລະຍຸດ -GenericName[lt]=Strateginis žaidimas -GenericName[lv]=Stratēģiskā Game -GenericName[mk]=Стратегиска игра -GenericName[mn]=Стратегийн тоглоом -GenericName[mt]=Logħba ta' strateġija -GenericName[nb]=Strategispill -GenericName[nl]=strategisch spel -GenericName[nn]=Strategispel -GenericName[nso]=Papadi ya Mokgwa wa Tharollo -GenericName[pl]=Gra strategiczna -GenericName[pt]=Jogo de Estratégia -GenericName[pt_BR]=Estratégia -GenericName[ro]=Joc de strategie -GenericName[ru]=Стратегическая игра -GenericName[se]=Strategiijaspeallu -GenericName[sk]=Strategická hra -GenericName[sl]=Strateška igra -GenericName[ss]=Umdlalo wekusebentisa indlela yekwenta -GenericName[sv]=Strategispel -GenericName[th]=เกมกลยุทธ์ -GenericName[tr]=Strateji Oyunu -GenericName[uk]=Гра на стратегію -GenericName[ven]=Mutambo wa maitele awo -GenericName[xh]=Indlela ethile Yomdlalo -GenericName[zh_CN]=策略游戏 -GenericName[zh_TW]=策略遊戲 -GenericName[zu]=Umdlalo weplani -Exec=freeciv-gtk3 -Icon=freeciv -Path= -Terminal=false - -Categories=Game;StrategyGame diff --git a/freeciv-manual b/freeciv-manual deleted file mode 100644 index b15f2ab..0000000 --- a/freeciv-manual +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -tmplang="$LANG" -test "$LC_MESSAGES" != "" && tmplang="$LC_MESSAGES" -test "$LC_ALL" != "" && tmplang="$LC_ALL" -test "$LANGUAGE" != "" && tmplang="$LANGUAGE" - -lang=`echo $tmplang|cut -d "_" -f 1` - -if [ "$lang" == "de" ]; then - DOCFILE="http://de.freeciv.wikia.com/wiki/Spielanleitung" -else - DOCFILE="http://freeciv.wikia.com/wiki/Game_Manual" -fi - -call-browser $DOCFILE diff --git a/freeciv-manual.desktop b/freeciv-manual.desktop deleted file mode 100644 index 34d5ad0..0000000 --- a/freeciv-manual.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=FreeCiv Manual -Name[de]=FreeCiv Handbuch -Exec=freeciv-manual -Icon=freeciv-manual diff --git a/freeciv-manual.png b/freeciv-manual.png deleted file mode 100644 index 7885154..0000000 --- a/freeciv-manual.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84220d3f4e91c8c0c03949f903ca7ccddc54396f4c155467a5355f794e979586 -size 1794 diff --git a/freeciv-qt.desktop b/freeciv-qt.desktop deleted file mode 100644 index 1907d2f..0000000 --- a/freeciv-qt.desktop +++ /dev/null @@ -1,72 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=Freeciv -Name[be]=Свабодная Цывілізацыя -Name[bg]=Цивилизация -Name[eo]=Libera Civilizludo -Name[fa]=تمدن‌آزاد -Name[nso]=civ yeo e lokollogilego -Name[sv]=Friciv -Name[ven]=civ ya Mahala -Name[vi]=Freeciv -Name[zh_CN]=文明 -Name[zh_TW]=Freeciv 仿「文明帝國」遊戲 -Type=Application -GenericName=Strategy Game -GenericName[af]=Strategie Speletjie -GenericName[be]=Стратэгічная гульня -GenericName[bg]=Стратегическа Игра -GenericName[bs]=Strateška igra -GenericName[ca]=Joc d'estratègia -GenericName[cs]=Strategická hra -GenericName[da]=Strategispil -GenericName[de]=Strategiespiel -GenericName[el]=Παιχνίδι Στρατηγικής -GenericName[eo]=Strategiludo -GenericName[es]=Juego de estrategia -GenericName[et]=Strateegiamäng -GenericName[fa]=بازی استراتژیک -GenericName[fi]=Strategiapeli -GenericName[fo]=Strategispæl -GenericName[fr]=Jeu de stratégie -GenericName[he]=משחק אסטרטגיה -GenericName[hr]=Igra strategije -GenericName[hu]=stratégiai -GenericName[is]=Herkænskuleikur -GenericName[it]=Gioco di strategia -GenericName[ja]=戦略ゲーム -GenericName[lo]=ເກມກົນລະຍຸດ -GenericName[lt]=Strateginis žaidimas -GenericName[lv]=Stratēģiskā Game -GenericName[mk]=Стратегиска игра -GenericName[mn]=Стратегийн тоглоом -GenericName[mt]=Logħba ta' strateġija -GenericName[nb]=Strategispill -GenericName[nl]=strategisch spel -GenericName[nn]=Strategispel -GenericName[nso]=Papadi ya Mokgwa wa Tharollo -GenericName[pl]=Gra strategiczna -GenericName[pt]=Jogo de Estratégia -GenericName[pt_BR]=Estratégia -GenericName[ro]=Joc de strategie -GenericName[ru]=Стратегическая игра -GenericName[se]=Strategiijaspeallu -GenericName[sk]=Strategická hra -GenericName[sl]=Strateška igra -GenericName[ss]=Umdlalo wekusebentisa indlela yekwenta -GenericName[sv]=Strategispel -GenericName[th]=เกมกลยุทธ์ -GenericName[tr]=Strateji Oyunu -GenericName[uk]=Гра на стратегію -GenericName[ven]=Mutambo wa maitele awo -GenericName[xh]=Indlela ethile Yomdlalo -GenericName[zh_CN]=策略游戏 -GenericName[zh_TW]=策略遊戲 -GenericName[zu]=Umdlalo weplani -Exec=freeciv-qt -Icon=freeciv -Path= -Terminal=false - -Categories=Game;StrategyGame diff --git a/freeciv.changes b/freeciv.changes index 1b77a36..6e2b2f6 100644 --- a/freeciv.changes +++ b/freeciv.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sun Feb 9 19:01:48 UTC 2025 - Andreas Stieger + +- Update to 3.1.4: + * not compatible with 3.0.x servers and vice versa. + * Player authentication is supported by default + * Max number of regular players (not counting barbarians) is now + 500 + * Rally Points can be set for the cities + * Previously silent generic actions now have event message types, + so can show up chat/messages/popup HRM#848791 + * There has been many changes to what actions each keyboard key + does, as required by changes in the actions themselves. See + Controls in Help for updated info. Especially; Paradrop now + has a key distinct from Pollution cleaning + * Adding local nation definitions now works properly + * https://freeciv.fandom.com/wiki/NEWS-3.1.0 +- Packaging changes: + * Introduce the Gtk4 front-end + * Switch the Gtk3 front-end to Gtk3.22 flavor + * Switch the Qt front-end to Qt6 on Tumbleweed + * Build with system LUA + * Use upstream .desktop files and simplify spec file + ------------------------------------------------------------------- Sat Feb 10 15:06:23 UTC 2024 - Carsten Ziepke diff --git a/freeciv.png b/freeciv.png deleted file mode 100644 index 7aea930..0000000 --- a/freeciv.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef31ce15e8665df4cd86cc7195407c909454dcf0d129729aa647e8f6ca7b923c -size 1852 diff --git a/freeciv.spec b/freeciv.spec index 30b3b24..6b837b7 100644 --- a/freeciv.spec +++ b/freeciv.spec @@ -2,6 +2,7 @@ # spec file for package freeciv # # Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,39 +18,40 @@ Name: freeciv -Version: 3.0.10 +Version: 3.1.4 Release: 0 Summary: Free Civilization Clone License: GPL-2.0-or-later Group: Amusements/Games/Strategy/Turn Based URL: https://www.freeciv.org Source0: https://files.freeciv.org/stable/%{name}-%{version}.tar.xz -Source1: freeciv-gtk3.desktop -Source2: freeciv-qt.desktop -Source3: freeciv.png -Source4: freeciv-manual -Source5: freeciv-manual.desktop -Source6: freeciv-manual.png -BuildRequires: audiofile-devel -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: curl-devel >= 7.9.7 +BuildRequires: c++_compiler BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRequires: gtk3-devel -BuildRequires: libbz2-devel -BuildRequires: libqt5-qtbase-common-devel -BuildRequires: libqt5-qtbase-devel -BuildRequires: libtool +BuildRequires: gtk3-devel >= 3.22.0 BuildRequires: pkgconfig BuildRequires: readline-devel -BuildRequires: update-desktop-files -BuildRequires: xz-devel -BuildRequires: zlib-devel BuildRequires: pkgconfig(SDL2_mixer) -BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(audiofile) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(gtk4) >= 4.0.0 +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(libcurl) >= 7.9.7 +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(lua) >= 5.4 +BuildRequires: pkgconfig(sdl2) >= 2.0.0 +BuildRequires: pkgconfig(sqlite3) >= 3.0.0 +BuildRequires: pkgconfig(zlib) Requires: freeciv_client-%{version} -Recommends: freeciv-lang +%if 0%{?suse_version} > 1600 +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Widgets) +%else +BuildRequires: libqt5-qtbase-common-devel +BuildRequires: libqt5-qtbase-devel +%endif +%lang_package %description A clone of the well known game Civilization by Microprose. @@ -70,15 +72,6 @@ Provides: freeciv_client-%{version} %description qt Freeciv executable using Qt library -%package lang -Summary: Translation files for freeciv -Group: Amusements/Games/Strategy/Turn Based -Requires: freeciv = %{version} -BuildArch: noarch - -%description lang -Translation files for freeciv main package and clients. - %package gtk3 Summary: Gtk3 client for freeciv Group: Amusements/Games/Strategy/Turn Based @@ -88,28 +81,44 @@ Provides: freeciv_client-%{version} %description gtk3 Freeciv executable using Gtk3 library +%package gtk4 +Summary: Gtk4 client for freeciv +Group: Amusements/Games/Strategy/Turn Based +Requires: freeciv = %{version} +Provides: freeciv_client-%{version} + +%description gtk4 +Freeciv executable using Gtk4 library + %prep -%setup -q +%autosetup -p1 %build -export MOCCMD="moc-qt5" -autoreconf -fi %configure \ - --enable-client=gtk3,qt \ - --with-readline \ - --disable-static \ - --docdir=%{_docdir}/freeciv + --enable-client=gtk3.22,gtk4,qt \ + --enable-fcmp=gtk3,gtk4,qt \ +%if 0%{?suse_version} > 1600 + --with-qtver=qt6 \ +%else + --with-qtver=qt5 \ +%endif + --enable-fcdb=sqlite3 \ + --enable-ruleedit \ + --with-readline \ + --with-libbz2 \ + --with-liblzma \ + --with-libzstd \ + --enable-sys-lua \ + --disable-static \ + --docdir=%{_docdir}/freeciv \ + %{nil} %make_build %install %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 -%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 +find %{buildroot} -type f -name "*.a" -print -delete +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}-core %find_lang %{name}-nations @@ -121,8 +130,6 @@ rm %{buildroot}%{_docdir}/freeciv/COPYING %doc README %license COPYING %exclude %{_docdir}/freeciv/INSTALL* -%exclude %{_libdir}/*.a -%exclude %{_libdir}/*.la %{_mandir}/man6/freeciv.6%{?ext_man} %{_mandir}/man6/freeciv-*.6%{?ext_man} %dir %{_sysconfdir}/%{name} @@ -131,7 +138,6 @@ rm %{buildroot}%{_docdir}/freeciv/COPYING %{_bindir}/freeciv-ruleup %{_bindir}/freeciv-server %{_bindir}/freeciv-manual -%{_datadir}/applications/freeciv-manual.desktop %{_datadir}/applications/org.freeciv.server.desktop %{_datadir}/applications/org.freeciv.ruledit.desktop %{_datadir}/freeciv/ @@ -140,26 +146,39 @@ rm %{buildroot}%{_docdir}/freeciv/COPYING %{_datadir}/icons/hicolor/*x*/apps/freeciv-modpack.png %{_datadir}/icons/hicolor/*x*/apps/freeciv-ruledit.png %{_datadir}/pixmaps/freeciv-client.png -%{_datadir}/pixmaps/freeciv-manual.png %{_datadir}/pixmaps/freeciv-modpack.png %{_datadir}/pixmaps/freeciv-ruledit.png -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/metainfo/org.freeciv.server.appdata.xml -%{_datadir}/metainfo/org.freeciv.ruledit.appdata.xml +%{_datadir}/metainfo/org.freeciv.server.metainfo.xml +%{_datadir}/metainfo/org.freeciv.ruledit.metainfo.xml %files lang -f %{name}-core.lang -f %{name}-nations.lang -f %{name}-ruledit.lang +%license COPYING %files gtk3 -%{_bindir}/freeciv-gtk3 +%license COPYING +%{_bindir}/freeciv-gtk3.22 %{_bindir}/freeciv-mp-gtk3 -%{_datadir}/applications/org.freeciv.gtk3.desktop -%{_datadir}/metainfo/org.freeciv.gtk3.appdata.xml -%{_datadir}/applications/org.freeciv.mp.gtk3.desktop -%{_datadir}/metainfo/org.freeciv.mp.gtk3.appdata.xml +%{_datadir}/applications/org.freeciv.gtk322.desktop +%{_datadir}/applications/org.freeciv.gtk3.mp.desktop +%{_datadir}/metainfo/org.freeciv.gtk322.metainfo.xml +%{_datadir}/metainfo/org.freeciv.gtk3.mp.metainfo.xml + +%files gtk4 +%license COPYING +%{_bindir}/freeciv-gtk4 +%{_bindir}/freeciv-mp-gtk4 +%{_datadir}/applications/org.freeciv.gtk4.desktop +%{_datadir}/applications/org.freeciv.gtk4.mp.desktop +%{_datadir}/metainfo/org.freeciv.gtk4.metainfo.xml +%{_datadir}/metainfo/org.freeciv.gtk4.mp.metainfo.xml %files qt +%license COPYING %{_bindir}/freeciv-qt +%{_bindir}/freeciv-mp-qt %{_datadir}/applications/org.freeciv.qt.desktop -%{_datadir}/metainfo/org.freeciv.qt.appdata.xml +%{_datadir}/applications/org.freeciv.qt.mp.desktop +%{_datadir}/metainfo/org.freeciv.qt.metainfo.xml +%{_datadir}/metainfo/org.freeciv.qt.mp.metainfo.xml %changelog