SPECS: freeciv.spec - updated to final 2.1.0 version

lisu lisu at pld-linux.org
Thu Nov 1 22:42:09 CET 2007


Author: lisu                         Date: Thu Nov  1 21:42:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to final 2.1.0 version

---- Files affected:
SPECS:
   freeciv.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/freeciv.spec
diff -u SPECS/freeciv.spec:1.100 SPECS/freeciv.spec:1.101
--- SPECS/freeciv.spec:1.100	Sun Apr  1 21:01:53 2007
+++ SPECS/freeciv.spec	Thu Nov  1 22:42:04 2007
@@ -1,34 +1,28 @@
 # $Revision$, $Date$
-#
-# 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)
@@ -53,13 +47,11 @@
 
 %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.
@@ -67,9 +59,10 @@
 %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}
 
@@ -80,34 +73,25 @@
 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}
 
@@ -128,7 +112,6 @@
 %{_datadir}/%{name}/civ1
 %{_datadir}/%{name}/civ2
 %{_datadir}/%{name}/default
-%{_datadir}/%{name}/history
 %{_datadir}/%{name}/nation
 %{_datadir}/%{name}/scenario
 %{_datadir}/%{name}/*.serv
@@ -139,14 +122,16 @@
 %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*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -155,73 +140,67 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.100  2007/04/01 19:01:53  rotom
-- up to 2.0.9
-
-Revision 1.99  2007/02/13 07:16:44  glen
-- tabs in preamble
+Revision 1.101  2007/11/01 21:42:04  lisu
+- updated to final 2.1.0 version
 
-Revision 1.98  2007/02/12 00:48:49  baggins
+Revision 1.79.2.17  2007/02/12 13:20:12  baggins
 - converted to UTF-8
 
-Revision 1.97  2006/03/16 19:49:42  glen
-- add CVE ref
-
-Revision 1.96  2006/03/09 21:28:20  jareq
-- updated to 2.0.8 [fixes CVE-2006-0047]
-
-Revision 1.95  2005/12/26 15:37:48  qboosh
-- added link patch to kill -lbind from linking, release 2
+Revision 1.79.2.16  2006/12/22 15:41:34  jareq
+- updated to 2.1.0 beta2
+- added freeland tileset
 
-Revision 1.94  2005/12/26 13:56:10  hawk
-- rebuild with new bind
-- release should be 1
+Revision 1.79.2.15  2006/03/25 20:42:56  jareq
+- updated to 2.1.0 beta1
 
-Revision 1.93  2005/11/15 08:47:19  speedo
-- updated to 2.0.7
+Revision 1.79.2.14  2005/04/27 13:42:15  paszczus
+- updated to 2.0.1
+- adaptarized
 
-Revision 1.92  2005/09/17 11:39:50  arekm
-- new readline 5.0
+Revision 1.79.2.13  2005/04/18 11:59:18  paszczus
+- updated to FINAL 2.0.0
 
-Revision 1.91  2005/09/02 16:37:31  adamg
-- updated to 2.0.5
+Revision 1.79.2.12  2005/03/02 06:26:06  adamg
+- updated to 2.0.0-beta8
 
-Revision 1.90  2005/08/11 09:46:18  radek
-- bcond_with(out) is followed by one \t, then bcond's name.
+Revision 1.79.2.11  2005/01/21 17:51:11  maho
+- version 2 beta 7
 
-Revision 1.89  2005/07/31 09:07:43  adamg
-- updated to 2.0.4
+Revision 1.79.2.10  2004/12/12 17:09:30  adamg
+- put config.sub into proper place
+- include civmanual binary too (goes into -clients)
 
-Revision 1.88  2005/07/14 13:26:25  jareq
-- updated to 2.0.3
-- rel 1
+Revision 1.79.2.9  2004/12/12 16:37:30  jareq
+- updated to 2.0.0 beta 5
 
-Revision 1.87  2005/07/01 06:21:28  jareq
-- updated to 2.0.2
-- rel 1
+Revision 1.79.2.8  2004/11/22 18:00:20  jareq
+- updated to 2.0.0 beta 4
 
-Revision 1.86  2005/06/12 02:06:44  ankry
-- locale fixes, rel. 3
+Revision 1.79.2.7  2004/11/05 09:29:38  jareq
+- updated to 2.0.0 beta3
 
-Revision 1.85  2005/05/23 18:41:22  qboosh
-- cleanup (app-defaults dir not used, plain configure)
+Revision 1.79.2.6  2004/10/24 12:17:42  jareq
+- updated to beta2
+- rel 0.1
 
-Revision 1.84  2005/05/23 18:29:22  qboosh
-- fixed app-defaults dir (is it used at all now?), cosmetics
+Revision 1.79.2.5  2004/10/11 09:21:45  jareq
+- added hexagonal tiles
+- added missing manpages
+- rel 0.2
 
-Revision 1.83  2005/05/23 18:23:38  adamg
-- include standard sounds
-- release 2
+Revision 1.79.2.4  2004/10/09 21:46:57  jareq
+- updated to 2.0.0 beta 1
 
-Revision 1.82  2005/05/22 18:26:29  saq
-- attempt to fix amd64 build
+Revision 1.79.2.3  2004/09/28 13:15:28  maho
+- up to current snap
+- fixed path to stdsound set
+- removed sdl client conditional (sdl client no longer mantained)
 
-Revision 1.81  2005/05/16 06:57:43  adamg
-- BuildRequires: pkgconfig
+Revision 1.79.2.2  2004/09/26 17:00:54  jareq
+- added missing Source0-md5
 
-Revision 1.80  2005/05/15 03:40:34  aredridel
-- up to 2.0.1
-- locale_names patch may need checking
+Revision 1.79.2.1  2004/09/26 16:25:22  jareq
+- snap 2004.09.23
 
 Revision 1.79  2004/09/25 16:58:45  havner
 - %datdir/%name owned by freeciv
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freeciv.spec?r1=1.100&r2=1.101&f=u



More information about the pld-cvs-commit mailing list