From: cvs2git Date: Thu, 19 Jun 2008 06:48:54 +0000 (+0000) Subject: This commit was manufactured by cvs2git to create branch 'AC-branch'. X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreeciv.git;a=commitdiff_plain;h=57c736a92f4dbff21bc769ddcd480c0cf1f9556e This commit was manufactured by cvs2git to create branch 'AC-branch'. Sprout from master 2007-11-30 21:25:46 UTC Jakub Bogusz '- update Bokmaal language code instead of removing translations' Cherrypick from master 2008-06-19 06:48:54 UTC Adam Gołębiowski '- updated to 2.1.5': freeciv-ggz.patch -> 1.1 freeciv.spec -> 1.117 --- diff --git a/freeciv-ggz.patch b/freeciv-ggz.patch new file mode 100644 index 0000000..1899731 --- /dev/null +++ b/freeciv-ggz.patch @@ -0,0 +1,12 @@ +diff -urN freeciv-2.1.3/m4/ggz.m4 freeciv-2.1.3.new/m4/ggz.m4 +--- freeciv-2.1.3/m4/ggz.m4 2008-04-11 19:19:23.313727512 +0200 ++++ freeciv-2.1.3.new/m4/ggz.m4 2008-04-11 19:18:45.141902683 +0200 +@@ -999,7 +999,7 @@ + AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"]) + fi + if test "$ggz_server" = "yes"; then +- AC_GGZ_SERVER ++ AC_GGZ_SERVER([], [force]) + AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ]) + else + if test "$try_ggz_server" = "yes"; then diff --git a/freeciv.spec b/freeciv.spec index e4a2a34..482976d 100644 --- a/freeciv.spec +++ b/freeciv.spec @@ -1,35 +1,36 @@ # -# TODO -# - dozen of unpackaged files -# # Conditional build: -%bcond_without gtk2 # build gtk1 client, not gtk2 +%bcond_without gtk # do not build gtk client +%bcond_without ggz_client # build without ggz client +%bcond_without ggz_server # build without ggz server # Summary: FREE CIVilization clone Summary(es.UTF-8): Clon del juego Civilization Summary(pl.UTF-8): Niekomercyjny klon CIVilization Summary(pt_BR.UTF-8): Clone do jogo Civilization Name: freeciv -Version: 2.1.1 -Release: 0.1 +Version: 2.1.5 +Release: 1 License: GPL v2+ Group: X11/Applications/Games/Strategy Source0: http://dl.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2 -# Source0-md5: cbbe72822d6698d9a66db2f383e2a421 +# Source0-md5: 1845f51077569e4033a7125910462184 Source1: ftp://ftp.freeciv.org/pub/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz # Source1-md5: 77215914712f2f351092918f5e41e39e Source2: ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/freeland-normal-2.0.0.tar.gz # Source2-md5: c9f061fca82aa50a19fbbc89c06ff81d Patch0: %{name}-link.patch Patch1: %{name}-desktop.patch +Patch2: %{name}-ggz.patch URL: http://www.freeciv.org/ BuildRequires: SDL_mixer-devel BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: esound-devel -%{!?with_gtk2:BuildRequires: gtk+-devel > 1.2.1} -%{?with_gtk2:BuildRequires: gtk+2-devel} -%{!?with_gtk2:BuildRequires: imlib-devel >= 1.9.2} +%{?with_gtk:BuildRequires: gtk+2-devel} +%{?with_ggz_client:BuildRequires: ggz-gtk-client-devel} +%{?with_ggz_server:BuildRequires: ggz-server-devel} +BuildRequires: libggz-devel BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: zlib-devel @@ -37,7 +38,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Free clone of Sid Meier's Civilization. Free Civilization clone for -unix and X. This is multiplayer strategic game and you can also play +Unix and X. This is multiplayer strategic game and you can also play against computer-AI players. %description -l es.UTF-8 @@ -59,9 +60,7 @@ Summary(pl.UTF-8): Klient gry Freeciv Group: X11/Applications/Games/Strategy Requires: %{name} = %{version}-%{release} Requires: SDL_mixer -Requires: esound -%{!?with_gtk2:Requires: gtk+ > 1.2.1} -%{!?with_gtk2:Requires: imlib >= 1.9.2} +Suggests: %{name}-server = %{version}-%{release} %description client This package contains Freeciv game client. @@ -85,15 +84,18 @@ Ten pakiet zawiera server gry Freeciv. %setup -q -a1 -a2 %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} %configure \ -%{!?with_gtk2: --enable-client=gtk} \ -%{?with_gtk2: --enable-client=gtk2} + --with-ggzd-confdir=%{_sysconfdir}/ggzd \ + %{?with_gtk: --enable-client=gtk} \ + %{!?with_ggz_client: --without-ggz-client} \ + %{!?with_ggz_server: --without-ggz-server} %{__make} @@ -106,12 +108,15 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} cp -f client/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}-client.desktop cp -f server/%{name}-server.desktop $RPM_BUILD_ROOT%{_desktopdir} +rm $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop + cp -f data/icons/32x32/*.png $RPM_BUILD_ROOT%{_pixmapsdir} cp -rf data/stdsounds{,.soundspec} $RPM_BUILD_ROOT%{_datadir}/%{name} cp -f freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name} cp -rf freeland $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/no +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules %find_lang %{name} @@ -136,20 +141,27 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/scenario %{_datadir}/%{name}/*.serv %{_mandir}/man6/civserver.6* +%{_sysconfdir}/ggzd/games/civserver.dsc +%{_sysconfdir}/ggzd/rooms/civserver.room %files client %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/civclient %attr(755,root,root) %{_bindir}/civmanual %{_desktopdir}/%{name}-client.desktop +%{_datadir}/%{name}/*.*spec %{_datadir}/%{name}/amplio +%{_datadir}/%{name}/buildings +%{_datadir}/%{name}/flags %{_datadir}/%{name}/freeciv.rc* %{_datadir}/%{name}/freeland +%{_datadir}/%{name}/hex2t %{_datadir}/%{name}/isophex %{_datadir}/%{name}/isotrident %{_datadir}/%{name}/misc -%{_datadir}/%{name}/trident -%{_datadir}/%{name}/flags -%{_datadir}/%{name}/*.*spec %{_datadir}/%{name}/stdsounds +%{_datadir}/%{name}/themes +%{_datadir}/%{name}/trident +%{_datadir}/%{name}/wonders %{_mandir}/man6/civclient.6* +%{_iconsdir}/hicolor/*/apps/*