X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freeciv.spec;h=19c7e0e5c0d565f3ab11a0fd273c12950f6ad7ae;hb=ac951725003e0d699799b78d509d88f667796a5b;hp=b10bebb8f648e3a2ad482ed21645fc35de8f356d;hpb=53427aff9e994e258dc1262826ced9023dfa9f20;p=packages%2Ffreeciv.git

diff --git a/freeciv.spec b/freeciv.spec
index b10bebb..19c7e0e 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -9,28 +9,27 @@ 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.10
-Release:	1
+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:	a2aa9b247d7f1581eff9e66786f4f747
-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
+# 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
-URL:		http://freeciv.wikia.com
+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:	libpng-devel
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
@@ -83,21 +82,22 @@ 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
 
 %build
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	--with-ggzd-confdir=%{_sysconfdir}/ggzd \
-	%{?with_gtk:	--enable-client=gtk} \
-	%{!?with_ggz_client:	--without-ggz-client} \
-	%{!?with_ggz_server:	--without-ggz-server}
+	%{?with_gtk:--enable-client=gtk} \
+	%{!?with_ggz_client:--without-ggz-client} \
+	%{!?with_ggz_server:--without-ggz-server}
 
 %{__make}
 
@@ -108,22 +108,24 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -f client/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}-client.desktop
-cp -f server/%{name}-server.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a client/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}-client.desktop
+cp -a 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}
+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 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 
+%{?with_gtk:cp -a data/gtk_menus.xml $RPM_BUILD_ROOT%{_datadir}/%{name}}
+
 %if %{with ggz_server}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/{games,rooms}
-install data/civserver.dsc $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/games/civserver.dsc
-install data/civserver.room $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/rooms/civserver.room
+cp -a data/civserver.dsc $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/games/civserver.dsc
+cp -a data/civserver.room $RPM_BUILD_ROOT%{_sysconfdir}/ggzd/rooms/civserver.room
 %endif
 
 %find_lang %{name}
@@ -134,13 +136,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README ChangeLog NEWS
-%{_pixmapsdir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/helpdata.txt
 
 %files server
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/civserver
+%attr(755,root,root) %{_bindir}/freeciv-server
 %{_desktopdir}/%{name}-server.desktop
 %{_datadir}/%{name}/civ1
 %{_datadir}/%{name}/civ2
@@ -148,15 +149,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/nation
 %{_datadir}/%{name}/scenario
 %{_datadir}/%{name}/*.serv
-%{_mandir}/man6/civserver.6*
-%{?with_ggz_server:%dir %{_sysconfdir}/ggzd/games}
-%{?with_ggz_server:%dir %{_sysconfdir}/ggzd/rooms}
-%{?with_ggz_server:%{_sysconfdir}/ggzd/games/civserver.dsc}
-%{?with_ggz_server:%{_sysconfdir}/ggzd/rooms/civserver.room}
+%{_mandir}/man6/freeciv-server.6*
+%{_iconsdir}/hicolor/*/apps/freeciv-server.png
+%{_pixmapsdir}/freeciv-server.png
+
+%if %{with ggz_server}
+%dir %{_sysconfdir}/ggzd
+%dir %{_sysconfdir}/ggzd/games
+%dir %{_sysconfdir}/ggzd/rooms
+%{_sysconfdir}/ggzd/games/civserver.dsc
+%{_sysconfdir}/ggzd/rooms/civserver.room
+%endif
 
 %files client
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/civclient
+%attr(755,root,root) %{_bindir}/freeciv-gtk2
 %attr(755,root,root) %{_bindir}/civmanual
 %{_desktopdir}/%{name}-client.desktop
 %{_datadir}/%{name}/*.*spec
@@ -164,7 +171,8 @@ 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
 %{_datadir}/%{name}/isotrident
@@ -173,5 +181,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/themes
 %{_datadir}/%{name}/trident
 %{_datadir}/%{name}/wonders
-%{_mandir}/man6/civclient.6*
-%{_iconsdir}/hicolor/*/apps/*
+%{_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