[warzone2100/f17] Update to 3.1 beta6

[jsynacek]

commit 022bab0ccdfe1cd430b63c45522f7dd7df1dae2a
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Thu Mar 15 11:38:09 2012 +0100

    Update to 3.1 beta6

 .gitignore       |    1 +
 sources          |    2 +-
 warzone2100.spec |   25 ++++++++++++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb532c4..6a3245e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ warzone2100-2.3.3.tar.gz
 /sequences.wz
 /warzone2100-2.3.7.tar.gz
 /warzone2100-2.3.9.tar.gz
+/warzone2100-3.1_beta6.tar.gz
diff --git a/sources b/sources
index ed2208e..8f9e972 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7185090a089c9c0e0eca7535a8f25dca  warzone2100-2.3.9.tar.gz
+ccad85787e14d0aecc2a0bbfe4032407  warzone2100-3.1_beta6.tar.gz
 6fa4d723d4019552cddf51d7ec8fb78c  sequences.wz
diff --git a/warzone2100.spec b/warzone2100.spec
index 819cdc6..6bde7cf 100644
--- a/warzone2100.spec
+++ b/warzone2100.spec
@@ -1,15 +1,18 @@
 Name:           warzone2100
-Version:        2.3.9
-Release:        2%{?dist}
+Version:        3.1
+Release:        0.1.beta6%{?dist}
 Summary:        Innovative 3D real-time strategy
 
 Group:          Amusements/Games
 License:        GPLv2+ and CC-BY-SA
 URL:            http://wz2100.net/
-Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/Warzone%202100%20%{version}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/project/%{name}/releases/%{version}_beta6/%{name}-%{version}_beta6.tar.gz
 Source1:        http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz
 
-BuildRequires: physfs-devel SDL_net-devel openal-soft-devel bison flex zip
+BuildRequires: physfs-devel >= 2.0
+BuildRequires: qt-devel >= 4.0
+BuildRequires: glew-devel >= 1.5.2
+BuildRequires: SDL_net-devel openal-soft-devel bison flex zip
 BuildRequires: libpng-devel libogg-devel libvorbis-devel
 BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel
 BuildRequires: automake >= 1.8
@@ -33,7 +36,9 @@ BuildArch:      noarch
 Video file for %{name}
 
 %prep
-%setup -q
+# %setup -q
+# restore after beta
+%setup -q -n %{name}-%{version}_beta6
 
 %build
 %configure --disable-rpath --disable-debug --with-distributor="Fedora"
@@ -56,6 +61,13 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
+### beta specific, triage after the full release
+%{_bindir}/map2lnd
+%{_bindir}/map2png
+%{_bindir}/map2preview
+%{_bindir}/mapconv
+%{_bindir}/mapinfo
+###
 %{_datadir}/icons/warzone*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/%{name}
@@ -67,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/sequences.wz
 
 %changelog
+* Thu Mar 15 2012 Jan Synáček <jsynacek at redhat.com> - 3.1-0.1.beta6
+- Update to 3.1 beta6
+
 * Thu Jan 05 2012 Jan Synáček <jsynacek at redhat.com> - 2.3.9-2
 - Rebuilt for GCC 4.7