From f0de2984a9df6d8a8fb820bea69f3c2d07e7d8fb Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Jun 20 2012 10:29:14 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	sources
	warzone2100.spec

---

diff --git a/.gitignore b/.gitignore
index 6a3245e..de10c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ warzone2100-2.3.3.tar.gz
 /warzone2100-2.3.7.tar.gz
 /warzone2100-2.3.9.tar.gz
 /warzone2100-3.1_beta6.tar.gz
+/warzone2100-3.1_beta7.tar.gz
+/warzone2100-3.1_beta9.tar.gz
diff --git a/sources b/sources
index 8f9e972..35ccef3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ccad85787e14d0aecc2a0bbfe4032407  warzone2100-3.1_beta6.tar.gz
+70b157956187f84879fa6bfe7f224054  warzone2100-3.1_beta9.tar.gz
 6fa4d723d4019552cddf51d7ec8fb78c  sequences.wz
diff --git a/warzone2100.spec b/warzone2100.spec
index 6bde7cf..9061a7e 100644
--- a/warzone2100.spec
+++ b/warzone2100.spec
@@ -1,12 +1,12 @@
 Name:           warzone2100
 Version:        3.1
-Release:        0.1.beta6%{?dist}
+Release:        0.4.beta9%{?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}/releases/%{version}_beta6/%{name}-%{version}_beta6.tar.gz
+Source0:        http://downloads.sourceforge.net/project/%{name}/releases/%{version}_beta9/%{name}-%{version}_beta9.tar.gz
 Source1:        http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz
 
 BuildRequires: physfs-devel >= 2.0
@@ -38,7 +38,7 @@ Video file for %{name}
 %prep
 # %setup -q
 # restore after beta
-%setup -q -n %{name}-%{version}_beta6
+%setup -q -n %{name}-%{version}_beta9
 
 %build
 %configure --disable-rpath --disable-debug --with-distributor="Fedora"
@@ -79,6 +79,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/sequences.wz
 
 %changelog
+* Wed May 09 2012 Jan Synáček <jsynacek@redhat.com> - 3.1-0.4.beta9
+- Update to 3.1 beta9
+- Fix spec
+
+* Wed Mar 21 2012 Jan Synáček <jsynacek@redhat.com> - 3.0-0.3.beta7
+- Fix sources
+
+* Wed Mar 21 2012 Jan Synáček <jsynacek@redhat.com> - 3.0-0.2.beta7
+- Update to 3.1 beta7
+
 * Thu Mar 15 2012 Jan Synáček <jsynacek@redhat.com> - 3.1-0.1.beta6
 - Update to 3.1 beta6