[tremulous] * Tue Aug 17 2010 Jan Kaluza <jkaluza at redhat.com> - 1.2.0-0.1.beta1 - update to 1.2.0 beta - fix #60

[Jan Kaluža]

commit 64031b003f57caca442ee1a188cb5f7626c72d44
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Tue Aug 17 11:47:44 2010 +0200

    * Tue Aug 17 2010 Jan Kaluza <jkaluza at redhat.com> - 1.2.0-0.1.beta1
    - update to 1.2.0 beta
    - fix #602374 - tremulous works on x86_64 now

 .gitignore     |    1 +
 sources        |    2 +-
 tremulous.spec |   31 ++++++++++++++++++-------------
 3 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d136c11..7726bba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tremulous-1.1.0-src-nolcc.tar.gz
+tremulous-1.2.0.beta1.tar.gz
diff --git a/sources b/sources
index 85d098d..7b388d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8672183ea169b22a0ffbe6f54e0b7342  tremulous-1.1.0-src-nolcc.tar.gz
+f6925b5f81410879286aa4b879eb79cb  tremulous-1.2.0.beta1.tar.gz
diff --git a/tremulous.spec b/tremulous.spec
index 3150800..c37f624 100644
--- a/tremulous.spec
+++ b/tremulous.spec
@@ -1,19 +1,22 @@
 Name:           tremulous
-Version:        1.1.0
-Release:        10%{?dist}
+Version:        1.2.0
+Release:        0.1.beta1%{?dist}
 Summary:        First Person Shooter game based on the Quake 3 engine
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://tremulous.net
-# this is %{name}-%{version}-src.tar.gz as containted in:
-# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip
-# with the src/tools/lcc dir removed as that contains non Free software
-Source0:        %{name}-%{version}-src-nolcc.tar.gz
+# To get the source tarball:
+# svn export svn://svn.icculus.org/tremulous/tags/RELEASE_GPP1/ tremulous-1.2.beta1
+# rm -rf tremulous-1.2.beta1/src/tools/lcc/
+# tar -czf tremulous-1.2.0.beta1.tar.gz tremulous-1.2.beta1
+Source0:        tremulous-1.2.0.beta1.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Patch0:         tremulous-1.1.0-syslibs.patch
 BuildRequires:  desktop-file-utils SDL-devel openal-soft-devel libvorbis-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  libcurl-devel
+BuildRequires:  zlib-devel
+BuildRequires:  speex-devel
 Requires:       tremulous-data = %{version}
 Requires:       hicolor-icon-theme opengl-games-utils
 
@@ -38,13 +41,11 @@ This is achieved by not only killing the opposing players but also
 removing their ability to respawn by destroying their spawn structures.
 
 %prep
-%setup -q -n %{name}-%{version}-src
-%patch0 -p1 -z .syslibs
+%setup -q -n tremulous-1.2.beta1
 
-# Rip out the jpeg sources and the SDL and freealut headers and use the
+# Rip out the bundled libraries and use the
 # system versions instead
-mv src/jpeg-6/jmemnobs.c .; rm src/jpeg-6/*; mv jmemnobs.c src/jpeg-6
-rm -r src/SDL12 src/AL
+rm -r src/SDL12 src/AL src/libcurl src/libspeex src/libs
 
 %build
 # the CROSS_COMPILING=1 is a hack to not build q3cc and qvm files
@@ -53,7 +54,7 @@ make %{?_smp_mflags} \
     OPTIMIZE="$RPM_OPT_FLAGS -fno-strict-aliasing -ffast-math" \
     DEFAULT_BASEDIR=%{_datadir}/%{name} USE_CODEC_VORBIS=1 \
     USE_LOCAL_HEADERS=0 BUILD_GAME_SO=0 GENERATE_DEPENDENCIES=0 \
-    CROSS_COMPILING=1
+    CROSS_COMPILING=1 USE_INTERNAL_SPEEX=0 USE_INTERNAL_ZLIB=0
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -95,6 +96,10 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 %changelog
+* Tue Aug 17 2010 Jan Kaluza <jkaluza at redhat.com> - 1.2.0-0.1.beta1
+- update to 1.2.0 beta
+- fix #602374 - tremulous works on x86_64 now
+
 * Sun Aug 16 2009 Rahul Sundaram <sundaram at fedoraproject.org> - 1.1.0-10
 - Switch to openal-soft