Nowa wersja freeciv

[Kacper Kornet]

Witam,


Podsyłam uaktualnienie freeciv do najnowszej wersji. Dodałem warunkowe
budowanie pluginów do obsługi dźwięku. Można by się zastanowić nad
budowaniem tylko z pluginem sdl, bo pliki z dźwiękami jakie dostarczamy w
formacie ogg, a pluginy alsa i esd ich nie obsługują.

#v+
Index: freeciv.spec
===================================================================
RCS file: /cvsroot/SPECS/freeciv.spec,v
retrieving revision 1.92
diff -u -r1.92 freeciv.spec
--- freeciv.spec	17 Sep 2005 11:39:50 -0000	1.92
+++ freeciv.spec	21 Oct 2005 17:11:28 -0000
@@ -2,27 +2,32 @@
 #
 # Conditional build:
 %bcond_without	gtk2		# build gtk1 client, not gtk2
+%bcond_without	esound		# esound sound plugin
+%bcond_without	sdl		# SDL sound plugin
+%bcond_without	alsa		# ALSA sound plugin		
 #
 Summary:	FREE CIVilization clone
 Summary(es):	Clon del juego Civilization
 Summary(pl):	Niekomercyjny klon CIVilization
 Summary(pt_BR):	Clone do jogo Civilization
 Name:		freeciv
-Version:	2.0.5
-Release:	2
+Version:	2.0.6
+Release:	1
 License:	GPL
 Group:		X11/Applications/Games/Strategy
 Source0:	http://dl.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
-# Source0-md5:	cc224a166f914b3404291c6fe997f90a
+# Source0-md5:	ba694b804beee7b9c09b5be1f303f7aa
 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
 URL:		http://www.freeciv.org/
-BuildRequires:	SDL_mixer-devel
+%{?with_sdl:BuildRequires:	SDL_mixer-devel}
+%{?with_alsa:BuildRequires:	alsa-lib-devel >= 1.0}
+%{?with_alsa:BuildRequires:	audiofile-devel >= 0.2}
 BuildRequires:	automake
-BuildRequires:	esound-devel
+%{?with_esound: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}
@@ -83,8 +88,12 @@
 %build
 cp -f /usr/share/automake/config.sub bootstrap
 %configure \
-%{!?with_gtk2:	--enable-client=gtk} \
-%{?with_gtk2:	--enable-client=gtk2}
+%{!?with_gtk2:		--enable-client=gtk} \
+%{?with_gtk2:		--enable-client=gtk2} \
+%{!?with_esound:	--disable-esd} \
+%{!?with_sdl:		--disable-sdl-mixer} \
+%{!?with_alsa:		--disable-alsa} \
+			--disable-winmm
 
 %{__make}
 
#v-


Pozdrawiam,
-- 
  Kacper