packages: freeciv/freeciv.spec - updated to final 2.2.0 version - merge wit...

Mon Feb 22 13:16:22 CET 2010

Author: lisu                         Date: Mon Feb 22 12:16:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to final 2.2.0 version
- merge with DEVEL
- add missing BR: libpng12-devel

---- Files affected:
packages/freeciv:
   freeciv.spec (1.129 -> 1.130) 

---- Diffs:

================================================================
Index: packages/freeciv/freeciv.spec
diff -u packages/freeciv/freeciv.spec:1.129 packages/freeciv/freeciv.spec:1.130

--- packages/freeciv/freeciv.spec:1.129	Sun Feb  7 22:47:44 2010
+++ packages/freeciv/freeciv.spec	Mon Feb 22 13:16:16 2010
@@ -1,24 +1,29 @@
 # $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
-
+#
 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.11
-Release:	2
+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:	b064e5949d211a46a9d6d050f3c98959
-Source1:	ftp://ftp.freeciv.org/pub/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz
+# 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:	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
@@ -32,6 +37,7 @@
 %{?with_ggz_server:BuildRequires:	ggz-server-devel}
 %{?with_gtk:BuildRequires:	gtk+2-devel}
 BuildRequires:	libggz-devel
+BuildRequires:	libpng12-devel
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
@@ -90,6 +96,7 @@
 %patch2 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -137,11 +144,10 @@
 %doc AUTHORS README ChangeLog NEWS
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/helpdata.txt
-%{_pixmapsdir}/*.png
 
 %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,9 @@
 %{_datadir}/%{name}/nation
 %{_datadir}/%{name}/scenario
 %{_datadir}/%{name}/*.serv
-%{_mandir}/man6/civserver.6*
+%{_mandir}/man6/freeciv-server.6*
+%{_iconsdir}/hicolor/*/apps/freeciv-server.png
+%{_pixmapsdir}/freeciv-server.png
 
 %if %{with ggz_server}
 %dir %{_sysconfdir}/ggzd
@@ -161,7 +169,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
@@ -178,8 +186,10 @@
 %{_datadir}/%{name}/themes
 %{_datadir}/%{name}/trident
 %{_datadir}/%{name}/wonders
-%{_mandir}/man6/civclient.6*
-%{_iconsdir}/hicolor/*/apps/*.png
+%{_mandir}/man6/freeciv-client.6*
+%{_mandir}/man6/freeciv-gtk2.6*
+%{_iconsdir}/hicolor/*/apps/freeciv-client.png
+%{_pixmapsdir}/freeciv-client.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -187,6 +197,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2010/02/22 12:16:16  lisu
+- updated to final 2.2.0 version
+- merge with DEVEL
+- add missing BR: libpng12-devel
+
 Revision 1.129  2010/02/07 21:47:44  glen
 - more cosmetics
 
@@ -201,9 +216,24 @@
 Revision 1.126  2010/02/04 15:15:10  lisu
 - up to 2.1.11
 
+Revision 1.125.2.4  2010/01/18 11:13:58  lisu
+- updated to 2.2.0-beta3
+
+Revision 1.125.2.3  2009/12/24 10:02:02  lisu
+- rel 0.beta1.1
+
+Revision 1.125.2.2  2009/12/24 09:33:07  lisu
+- don't install server and client icons with main package
+
+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
+- create inexistent dirs in %%files
 - adpater
 
 Revision 1.124  2009/03/31 09:33:05  lisu
@@ -445,7 +475,7 @@
 - upgrade to 1.14.1
 
 Revision 1.70  2003/12/10 16:23:49  grzegol
-- _applnkdir -> _desktopdir; rel. 1.%{beta}.1
+- _applnkdir -> _desktopdir; rel. 1.%%{beta}.1
 
 Revision 1.69  2003/11/20 17:23:28  jareq
 - upgrade to 1.14.1-beta4
@@ -505,17 +535,17 @@
 
 Revision 1.51  2002/05/21 10:32:06  pioklo
 - update to 1.12.2
-- fix %doc section,STBR
+- fix %%doc section,STBR
 
 Revision 1.50  2002/04/25 16:19:33  arturs
-- fixed a small typo
+fixed a small typo
 
 Revision 1.49  2002/02/22 23:28:54  kloczek
 - removed all Group fields translations (our rpm now can handle translating
   Group field using gettext).
 
 Revision 1.48  2002/01/18 02:12:58  kloczek
-- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.47  2001/08/11 14:29:00  kloczek
 - updated to 1.12.0.
@@ -530,7 +560,7 @@
 - added automake, autoconf to BuildRequires.
 
 Revision 1.43  2001/04/13 15:35:17  wiget
-- added gettext patch; rebuild with readline 4.2; release 2
+added gettext patch; rebuild with readline 4.2; release 2
 
 Revision 1.42  2001/02/02 17:50:33  kloczek
 - perl -pi -e "s/^\%\{_datadir\}\/pixmaps/\%\{_pixmapsdir\}/"
@@ -557,10 +587,10 @@
 - updated to 1.10.2.
 
 Revision 1.34  2000/06/09 07:54:40  kloczek
-- more %{__make} macros.
+- more %%{__make} macros.
 
 Revision 1.33  2000/06/09 07:22:50  kloczek
-- added using %{__make} macro.
+- added using %%{__make} macro.
 
 Revision 1.32  2000/05/18 21:48:35  kloczek
 - spec adapterized.
@@ -602,3 +632,4 @@
 
 Revision 1.22  1999/07/12 23:05:56  kloczek
 - added using CVS keywords in %changelog (for automating them).
+
================================================================

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

