SPECS: tremulous.spec - added tjw's backport patch, includes curl support f...

[sparky]

Author: sparky                       Date: Tue Sep  2 23:11:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added tjw's backport patch, includes curl support for faster data download

---- Files affected:
SPECS:
   tremulous.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/tremulous.spec
diff -u SPECS/tremulous.spec:1.10 SPECS/tremulous.spec:1.11
--- SPECS/tremulous.spec:1.10	Tue Sep  2 21:31:13 2008
+++ SPECS/tremulous.spec	Wed Sep  3 01:11:40 2008
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Strzelanina w pierwszej osobie z elementami strategii
 Name:		tremulous
 Version:	1.1.0
-Release:	2
+Release:	2.5
 License:	GPL
 Group:		Applications/Games
 Source0:	%{name}-%{version}-src.tar.gz
@@ -17,19 +17,22 @@
 Source3:	tremded.sysconfig
 Source4:	%{name}.desktop
 Source5:	%{name}-smp.desktop
-Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-LIBDIR.patch
-Patch2:		%{name}-alpha.patch
+Patch0:		%{name}-tjw.patch
+Patch1:		%{name}-Makefile.patch
+Patch2:		%{name}-LIBDIR.patch
+Patch3:		%{name}-alpha.patch
 URL:		http://www.tremulous.net/
 %if %{with openal}
 BuildRequires:	OpenAL-devel
 %endif
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL-devel
+BuildRequires:	curl-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	OpenGL
+Suggests:	curl-lib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-ffast-math -funroll-loops -fomit-frame-pointer -fno-strict-aliasing
@@ -182,9 +185,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch0 -p1
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} -i -e 's/-Werror//' src/tools/asm/Makefile
 %{__sed} -i -e '/OP_BLOCK_COPY not dword aligned/s#^#//#' src/qcommon/vm_interpreted.c
@@ -202,21 +206,25 @@
 USE_OPENAL      = 0
 %endif
 
+USE_LOCAL_HEADERS = 0
+USE_CURL_DLOPEN = 1
+
 override BR = rel
 override B = rel
 
 override CFLAGS := %{rpmcflags} \
-        -DDEFAULT_BASEDIR=\"%{_datadir}/games/%{name}\" \
-        -DLIBDIR=\"%{_libdir}/%{name}\" \
-        -Wall -Wimplicit -Wstrict-prototypes \
-        -DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 %(sdl-config --cflags) \
+	-DDEFAULT_BASEDIR=\"%{_datadir}/games/%{name}\" \
+	-DLIBDIR=\"%{_libdir}/%{name}\" \
+	-Wall -Wimplicit -Wstrict-prototypes \
+	-DUSE_SDL_VIDEO=1 -DUSE_SDL_SOUND=1 %(sdl-config --cflags) \
+	-DUSE_CURL=1 -DUSE_CURL_DLOPEN=1 \
 %if %{with openal}
-        -DUSE_OPENAL=1 \
+	-DUSE_OPENAL=1 \
 %endif
 %ifnarch %{ix86} %{x8664}
-        -DNO_VM_COMPILED \
+	-DNO_VM_COMPILED \
 %endif  
-        -DNDEBUG -MMD
+	-DNDEBUG -MMD
 
 override LCC_CFLAGS := $(CFLAGS) -MMD
 override Q3ASM_CFLAGS := $(CFLAGS)
@@ -302,6 +310,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008/09/02 23:11:40  sparky
+- added tjw's backport patch, includes curl support for faster data download
+
 Revision 1.10  2008/09/02 19:31:13  sparky
 - cleaner build method
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tremulous.spec?r1=1.10&r2=1.11&f=u