- proper and complete merge with DEVEL

- fix commit log
- more todo

Changed files:
    freeciv.spec -> 1.104

diff --git a/freeciv.spec b/freeciv.spec
index 9b14f2f8d3b07a6ae1905565cd7f66406332312e..76b64fa4ff253860db476b8e0c32671b59d29c27 100644 (file)
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,9 +1,15 @@
+#
 # TODO
 # - dozen of unpackaged files
+# - consider using desktop file included with project (for clinet icon presentation)
+#
+# 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.1.0
 Release:       0.1
@@ -11,18 +17,23 @@ License:    GPL v2+
 Group:         X11/Applications/Games/Strategy
 Source0:       http://dl.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
 # 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
+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
+Source3:       %{name}-client.desktop
+Source4:       %{name}-server.desktop
+Source5:       %{name}.png
+Patch0:                %{name}-link.patch
 URL:           http://www.freeciv.org/
 BuildRequires: SDL_mixer-devel
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: esound-devel
-BuildRequires: gtk+2-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: readline-devel
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,11 +58,13 @@ 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.
@@ -59,10 +72,9 @@ 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}
 
@@ -73,26 +85,36 @@ This package contans Freeciv game server.
 Ten pakiet zawiera server gry Freeciv.
 
 %prep
-%setup -q -a 4 -a 5
+%setup -q -a1 -a2
+%patch0 -p1
 
 %build
-cp -f %{_datadir}/automake/config.sub bootstrap
-%configure2_13 
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+%{!?with_gtk2: --enable-client=gtk} \
+%{?with_gtk2:  --enable-client=gtk2}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults \
-       $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE5} $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
+
 %find_lang %{name}
 
 %clean
@@ -128,8 +150,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/isophex
 %{_datadir}/%{name}/isotrident
 %{_datadir}/%{name}/misc
-%{_datadir}/%{name}/stdsounds
 %{_datadir}/%{name}/trident
 %{_datadir}/%{name}/flags
 %{_datadir}/%{name}/*.*spec
+%{_datadir}/%{name}/stdsounds
 %{_mandir}/man6/civclient.6*