- updated to final 2.1.0 version

Changed files:
    freeciv.spec -> 1.101

diff --git a/freeciv.spec b/freeciv.spec
index 22762faf0cc2ad870d1832e0e1c28018570202d3..cdca4dbf30312c8926bc93d17a0c2a03f4e85f5f 100644 (file)
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,33 +1,27 @@
-#
-# Conditional build:
-%bcond_without gtk2            # build gtk1 client, not gtk2
-#
 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
+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.0.9
-Release:       1
-License:       GPL
+Version:       2.1.0
+Release:       0.1
+License:       GPL v2+
 Group:         X11/Applications/Games/Strategy
 Source0:       http://dl.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
-# Source0-md5: 7bfa40220bd8e19a263ca247202682ce
-Source1:       ftp://ftp.freeciv.org/freeciv/contrib/sounds/sets/stdsounds3.tar.gz
-# Source1-md5: 77215914712f2f351092918f5e41e39e
-Source2:       %{name}-client.desktop
-Source3:       %{name}-server.desktop
-Source4:       %{name}.png
-Patch0:                %{name}-link.patch
+# Source0-md5: f640aa48abca0a235220d6df22b9bc82
+Source1:       %{name}-client.desktop
+Source2:       %{name}-server.desktop
+Source3:       %{name}.png
+Source4:       ftp://ftp.freeciv.org/pub/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz
+# Source4-md5: 77215914712f2f351092918f5e41e39e
+Source5:       ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/freeland-normal-2.0.0.tar.gz
+# Source5-md5: c9f061fca82aa50a19fbbc89c06ff81d
+Patch0:                %{name}-locale_names.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}
-BuildRequires: pkgconfig
+BuildRequires: gtk+2-devel
 BuildRequires: readline-devel
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,13 +46,11 @@ Window.
 
 %package client
 Summary:       Freeciv game client
-Summary(pl.UTF-8):     Klient gry Freeciv
+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}
 
 %description client
 This package contains Freeciv game client.
@@ -66,9 +58,10 @@ This package contains Freeciv game client.
 %description client -l pl.UTF-8
 Ten pakiet zawiera klienta gry Freeciv.
 
+
 %package server
 Summary:       Freeciv game server
-Summary(pl.UTF-8):     Serwer gry Freeciv
+Summary(pl.UTF-8):   Serwer gry Freeciv
 Group:         X11/Applications/Games/Strategy
 Requires:      %{name} = %{version}-%{release}
 
@@ -79,34 +72,25 @@ This package contans Freeciv game server.
 Ten pakiet zawiera server gry Freeciv.
 
 %prep
-%setup -q -a1
-%patch0 -p1
+%setup -q -a 4 -a 5
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-%{!?with_gtk2: --enable-client=gtk} \
-%{?with_gtk2:  --enable-client=gtk2}
-
+cp -f %{_datadir}/automake/config.sub bootstrap
+%configure2_13 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults \
+       $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
-
-cp -rf data/stdsounds{,.soundspec} $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/he{_IL,}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/no
+install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -f freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -rf freeland $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %find_lang %{name}
 
@@ -127,7 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/civ1
 %{_datadir}/%{name}/civ2
 %{_datadir}/%{name}/default
-%{_datadir}/%{name}/history
 %{_datadir}/%{name}/nation
 %{_datadir}/%{name}/scenario
 %{_datadir}/%{name}/*.serv
@@ -138,12 +121,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/civclient
 %attr(755,root,root) %{_bindir}/civmanual
 %{_desktopdir}/%{name}-client.desktop
+%{_datadir}/%{name}/amplio
 %{_datadir}/%{name}/freeciv.rc*
+%{_datadir}/%{name}/freeland
+%{_datadir}/%{name}/isophex
 %{_datadir}/%{name}/isotrident
 %{_datadir}/%{name}/misc
+%{_datadir}/%{name}/stdsounds
 %{_datadir}/%{name}/trident
-%{_datadir}/%{name}/isophex
 %{_datadir}/%{name}/flags
 %{_datadir}/%{name}/*.*spec
-%{_datadir}/%{name}/stdsounds
 %{_mandir}/man6/civclient.6*