packages (DEVEL): freeciv/freeciv.spec - updated to 2.2.0-beta1 - can't con...

[lisu]

Author: lisu                         Date: Thu Dec 24 09:08:45 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated to 2.2.0-beta1
- can't connect to ftp://ftp.freeciv.org so now additional packages are taken from DISTFILES
- some file names changes: civserver -> freeciv-server, civclient -> freeciv-gtk2
- include man pages for freeciv-gtk2

---- Files affected:
packages/freeciv:
   freeciv.spec (1.125 -> 1.125.2.1) 

---- Diffs:

================================================================
Index: packages/freeciv/freeciv.spec
diff -u packages/freeciv/freeciv.spec:1.125 packages/freeciv/freeciv.spec:1.125.2.1
--- packages/freeciv/freeciv.spec:1.125	Thu Nov 26 12:45:14 2009
+++ packages/freeciv/freeciv.spec	Thu Dec 24 10:08:39 2009
@@ -1,24 +1,30 @@
 # $Revision$, $Date$
 #
+# 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
 %bcond_without  ggz_server	# build without ggz server
 #
+%define		_beta	beta1
 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.10
+Version:	2.2.0
 Release:	1
 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
+Source0:	http://downloads.sourceforge.net/freeciv/%{name}-%{version}-%{_beta}.tar.bz2
+# Source0-md5:	573b95710ef75fd4860492d58162e948
+#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:	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
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-desktop.patch
@@ -84,7 +90,7 @@
 Ten pakiet zawiera server gry Freeciv.
 
 %prep
-%setup -q -a1 -a2
+%setup -q -n %{name}-%{version}-%{_beta} -a1 -a2
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -141,7 +147,7 @@
 
 %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
@@ -149,7 +155,8 @@
 %{_datadir}/%{name}/nation
 %{_datadir}/%{name}/scenario
 %{_datadir}/%{name}/*.serv
-%{_mandir}/man6/civserver.6*
+%{_mandir}/man6/freeciv-server.6*
+%{?with_ggz_server:%dir %{_sysconfdir}/ggzd}
 %{?with_ggz_server:%dir %{_sysconfdir}/ggzd/games}
 %{?with_ggz_server:%dir %{_sysconfdir}/ggzd/rooms}
 %{?with_ggz_server:%{_sysconfdir}/ggzd/games/civserver.dsc}
@@ -157,7 +164,7 @@
 
 %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
@@ -174,7 +181,8 @@
 %{_datadir}/%{name}/themes
 %{_datadir}/%{name}/trident
 %{_datadir}/%{name}/wonders
-%{_mandir}/man6/civclient.6*
+%{_mandir}/man6/freeciv-client.6*
+%{_mandir}/man6/freeciv-gtk2.6*
 %{_iconsdir}/hicolor/*/apps/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -183,6 +191,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125.2.1  2009/12/24 09:08:39  lisu
+- updated to 2.2.0-beta1
+- can't connect to ftp://ftp.freeciv.org so now additional packages are taken from DISTFILES
+- some file names changes: civserver -> freeciv-server, civclient -> freeciv-gtk2
+- include man pages for freeciv-gtk2
+
 Revision 1.125  2009/11/26 11:45:14  lisu
 - up to 2.1.10
 - create inexistent dirs in %%files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freeciv/freeciv.spec?r1=1.125&r2=1.125.2.1&f=u