- really disable freeland tileset

[packages/freeciv.git] / freeciv.spec

diff --git a/freeciv.spec b/freeciv.spec
index 3ea4cef4d1a0527bb30143745f510fcfc8872826..19c7e0e5c0d565f3ab11a0fd273c12950f6ad7ae 100644 (file)
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,7 +1,4 @@
 #
-# TODO: ftp://ftp.freeciv.org seems to be dead, so spec downloads stdsounds3.tar.gz and
-#      freeland-normal-2.0.0.tar.gz from DISTFILES until somebody find better external source
-#
 # Conditional build:
 %bcond_without gtk             # do not build gtk client
 %bcond_without  ggz_client     # build without ggz client
@@ -12,18 +9,14 @@ 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.2.0
+Version:       2.2.3
 Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Games/Strategy
 Source0:       http://downloads.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
-# Source0-md5: 49c08904d2402fe46248641a8bbd9ef3
-#Source1:      ftp://ftp.freeciv.org/pub/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz
-Source1:       stdsounds3.tar.gz
-# Source1-md5: 77215914712f2f351092918f5e41e39e
-#Source2:      ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/freeland-normal-2.0.0.tar.gz
-Source2:       freeland-normal-2.0.0.tar.gz
-# Source2-md5: c9f061fca82aa50a19fbbc89c06ff81d
+# Source0-md5: b324e3c59f029d0566482f584181a4b2
+# NOTE: current version of freeland tiles does not work with newest freeciv version
+#Source1:      http://download.gna.org/freeciv/contrib/tilesets/freeland/freeland-normal-2.0.0.tar.gz
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-ggz.patch
@@ -31,13 +24,11 @@ URL:                http://freeciv.wikia.com/
 BuildRequires: SDL_mixer-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
-BuildRequires: esound-devel
 BuildRequires: gettext-devel
 %{?with_ggz_client:BuildRequires:      ggz-gtk-client-devel}
-%{?with_ggz_server:BuildRequires:      ggz-server-devel}
 %{?with_gtk:BuildRequires:     gtk+2-devel}
 BuildRequires: libggz-devel
-BuildRequires: libpng12-devel
+BuildRequires: libpng-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
@@ -91,7 +82,7 @@ This package contans Freeciv game server.
 Ten pakiet zawiera server gry Freeciv.
 
 %prep
-%setup -q -a1 -a2
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -123,7 +114,7 @@ rm $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 cp -a data/icons/32x32/*.png $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -a data/stdsounds{,.soundspec} $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name}
+#cp -a freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a freeland $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/no
@@ -180,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/buildings
 %{_datadir}/%{name}/flags
 %{_datadir}/%{name}/freeciv.rc*
-%{_datadir}/%{name}/freeland
+#%%{_datadir}/%{name}/freeland
 %{?with_gtk:%{_datadir}/%{name}/gtk_menus.xml}
 %{_datadir}/%{name}/hex2t
 %{_datadir}/%{name}/isophex
@@ -191,6 +182,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/trident
 %{_datadir}/%{name}/wonders
 %{_mandir}/man6/freeciv-client.6*
+%{_mandir}/man6/freeciv-ftwl.6*
 %{_mandir}/man6/freeciv-gtk2.6*
+%{_mandir}/man6/freeciv-sdl.6*
+%{_mandir}/man6/freeciv-win32.6*
+%{_mandir}/man6/freeciv-xaw.6*
 %{_iconsdir}/hicolor/*/apps/freeciv-client.png
 %{_pixmapsdir}/freeciv-client.png