rpms/freeciv/FC-3 freeciv-desktop.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 freeciv.spec, 1.5, 1.6 sources, 1.5, 1.6 freeciv_desktop.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/freeciv/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2311

Modified Files:
	.cvsignore freeciv.spec sources 
Added Files:
	freeciv-desktop.patch 
Removed Files:
	freeciv_desktop.patch 
Log Message:
* Thu Mar  9 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.8-1
- Add dist tag.
- Update to 2.0.8 (fixes #184507).
- Remove unnecessary BR (alsa-lib-devel & SDL-devel).
- Use new stdsounds.


freeciv-desktop.patch:

Index: freeciv-desktop.patch
===================================================================
RCS file: freeciv-desktop.patch
diff -N freeciv-desktop.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ freeciv-desktop.patch	9 Mar 2006 15:24:12 -0000	1.3
@@ -0,0 +1,12 @@
+diff -ur freeciv-2.0.7.OLD/bootstrap/freeciv.desktop.in freeciv-2.0.7/bootstrap/freeciv.desktop.in
+--- freeciv-2.0.7.OLD/bootstrap/freeciv.desktop.in	2005-10-13 13:38:05.000000000 -0400
++++ freeciv-2.0.7/bootstrap/freeciv.desktop.in	2005-11-06 09:58:18.000000000 -0500
+@@ -14,7 +14,7 @@
+ Comment[pl]=Gra strategiczna podobna do Cywilizacji(TM)
+ Comment[pt]=Jogo similar ao Civilization(TM)
+ Exec=civclient
+-Icon=gnome-globe.png
++Icon=freeciv.xpm
+ StartupNotify=true
+ Terminal=false
+ Type=Application


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freeciv/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Apr 2005 02:12:51 -0000	1.5
+++ .cvsignore	9 Mar 2006 15:24:12 -0000	1.6
@@ -1,2 +1,2 @@
-freeciv-2.0.0.tar.bz2
-stdsounds2.tar.gz
+freeciv-2.0.8.tar.bz2
+stdsounds3.tar.gz


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/FC-3/freeciv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freeciv.spec	19 Apr 2005 03:12:41 -0000	1.5
+++ freeciv.spec	9 Mar 2006 15:24:12 -0000	1.6
@@ -1,16 +1,16 @@
 Name:           freeciv
-Version:        2.0.0
-Release:        3.fc3
+Version:        2.0.8
+Release:        1%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.freeciv.org/index.php/Freeciv
 Source0:        ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2
-Source1:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz 
+Source1:	ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz 
 Source2:	%{name}-server.desktop
 Source3:	%{name}.xpm
-Patch1:		%{name}_desktop.patch
+Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-aifill.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,10 +18,8 @@
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bind-devel
-BuildRequires:	SDL-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	esound-devel
-BuildRequires:	alsa-lib-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -35,12 +33,11 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p0 -b .desktop
+%patch1 -p1 -b .desktop
 %patch2 -p0 -b .aifill
 
 %build
-%configure --enable-debug=no	\
-	--enable-client=gtk2
+%configure --enable-client=gtk2
 make %{?_smp_mflags}
 
 %install
@@ -62,7 +59,10 @@
 rm $RPM_BUILD_ROOT%{_bindir}/civmanual
 
 # Add the sound files.
-(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; )
+tar xzf %{SOURCE1}
+cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds
+cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds
 
 %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
 
@@ -82,11 +82,17 @@
 %{_bindir}/civclient
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.xpm
-%config %{_datadir}/applications/*
+%{_datadir}/applications/fedora-*.desktop
 %{_mandir}/man6/civserver.6.gz
 %{_mandir}/man6/civclient.6.gz
 
 %changelog
+* Thu Mar  9 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.8-1
+- Add dist tag.
+- Update to 2.0.8 (fixes #184507).
+- Remove unnecessary BR (alsa-lib-devel & SDL-devel).
+- Use new stdsounds.
+
 * Mon Apr 18 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.0-3.fc3
 - Re-add patch to set aifill to 5 on new servers to get some opponents.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freeciv/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Apr 2005 02:12:51 -0000	1.5
+++ sources	9 Mar 2006 15:24:12 -0000	1.6
@@ -1,2 +1,2 @@
-fa7170026cc2aefdafd43b27a4bfaf80  freeciv-2.0.0.tar.bz2
-63b06631addeaccf45bc4bf6b8ddf7b3  stdsounds2.tar.gz
+9ebd5899c2c78362e0e2c68791673a88  freeciv-2.0.8.tar.bz2
+77215914712f2f351092918f5e41e39e  stdsounds3.tar.gz


--- freeciv_desktop.patch DELETED ---