Author: lisu Date: Tue Nov 27 00:20:50 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - proper and complete merge with DEVEL - fix commit log - more todo
---- Files affected: SPECS: freeciv.spec (1.103 -> 1.104) ---- Diffs: ================================================================ Index: SPECS/freeciv.spec diff -u SPECS/freeciv.spec:1.103 SPECS/freeciv.spec:1.104 --- SPECS/freeciv.spec:1.103 Fri Nov 2 01:41:25 2007 +++ SPECS/freeciv.spec Tue Nov 27 01:20:45 2007 @@ -1,10 +1,16 @@ # $Revision$, $Date$ +# # 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 @@ -12,18 +18,23 @@ 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) @@ -48,11 +59,13 @@ %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. @@ -60,10 +73,9 @@ %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} @@ -74,26 +86,36 @@ 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 @@ -129,10 +151,10 @@ %{_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* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -141,6 +163,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.104 2007-11-27 00:20:45 lisu +- proper and complete merge with DEVEL +- fix commit log +- more todo + Revision 1.103 2007-11-02 00:41:25 glen - add todo @@ -150,6 +177,74 @@ Revision 1.101 2007/11/01 21:42:04 lisu - updated to final 2.1.0 version +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.98 2007/02/12 00:48:49 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.94 2005/12/26 13:56:10 hawk +- rebuild with new bind +- release should be 1 + +Revision 1.93 2005/11/15 08:47:19 speedo +- updated to 2.0.7 + +Revision 1.92 2005/09/17 11:39:50 arekm +- new readline 5.0 + +Revision 1.91 2005/09/02 16:37:31 adamg +- updated to 2.0.5 + +Revision 1.90 2005/08/11 09:46:18 radek +- bcond_with(out) is followed by one \t, then bcond's name. + +Revision 1.89 2005/07/31 09:07:43 adamg +- updated to 2.0.4 + +Revision 1.88 2005/07/14 13:26:25 jareq +- updated to 2.0.3 +- rel 1 + +Revision 1.87 2005/07/01 06:21:28 jareq +- updated to 2.0.2 +- rel 1 + +Revision 1.86 2005/06/12 02:06:44 ankry +- locale fixes, rel. 3 + +Revision 1.85 2005/05/23 18:41:22 qboosh +- cleanup (app-defaults dir not used, plain configure) + +Revision 1.84 2005/05/23 18:29:22 qboosh +- fixed app-defaults dir (is it used at all now?), cosmetics + +Revision 1.83 2005/05/23 18:23:38 adamg +- include standard sounds +- release 2 + +Revision 1.82 2005/05/22 18:26:29 saq +- attempt to fix amd64 build + +Revision 1.81 2005/05/16 06:57:43 adamg +- BuildRequires: pkgconfig + +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.17 2007/02/12 13:20:12 baggins - converted to UTF-8 @@ -239,7 +334,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 @@ -299,17 +394,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/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" +perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" Revision 1.47 2001/08/11 14:29:00 kloczek - updated to 1.12.0. @@ -351,10 +446,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. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freeciv.spec?r1=1.103&r2=1.104&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
