[vdrift] New upstream.

[Jon Ciesla]

commit 6c230aeb771f9cb617efa39f3fbe0c1c7a7dc748
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jan 19 20:46:06 2012 -0600

    New upstream.

 .gitignore              |    1 +
 sources                 |    2 +-
 vdrift-SConstruct.patch |    8 ++++----
 vdrift.spec             |   30 +++++++++++++++++++-----------
 4 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87f17bd..2885f62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 vdrift-2009-06-15-src.tar.bz2
 /vdrift-2010-06-30.tar.bz2
+/vdrift-2011-10-22.tar.bz2
diff --git a/sources b/sources
index 2231d6e..1b3d562 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddcaf90bb25f9ce9cc084d7f467d7b56  vdrift-2010-06-30.tar.bz2
+6f8806ab1be303e9e1e47522c9eee890  vdrift-2011-10-22.tar.bz2
diff --git a/vdrift-SConstruct.patch b/vdrift-SConstruct.patch
index 1d7b368..30ef37a 100644
--- a/vdrift-SConstruct.patch
+++ b/vdrift-SConstruct.patch
@@ -1,6 +1,6 @@
---- SConstruct	2007-04-16 10:25:43.000000000 -0500
-+++ SConstruct	2007-04-16 10:28:02.000000000 -0500
-@@ -352,8 +352,8 @@
+--- SConstruct~	2011-09-01 04:22:58.000000000 -0500
++++ SConstruct	2012-01-18 14:40:08.535239681 -0600
+@@ -507,8 +507,8 @@
  # Subdirectories #
  #----------------#
  Export(['env', 'version', 'src_dir', 'bin_dir'])
@@ -10,4 +10,4 @@
 +#    SConscript('data/SConscript')
  
  if 'src-package' in COMMAND_LINE_TARGETS:
-     SConscript('po/SConscript')
+     SConscript('tools/SConscript')
diff --git a/vdrift.spec b/vdrift.spec
index 2b9582c..cfac64f 100644
--- a/vdrift.spec
+++ b/vdrift.spec
@@ -1,12 +1,13 @@
 Name: vdrift
-Version:  20100630
-Release:  8%{?dist}
+Version:  20111022
+Release:  1%{?dist}
 Summary: Driving/drift racing simulation
 
 Group: Amusements/Games 
-License: GPLv2+
+License: GPLv3+
 URL: http://vdrift.net
-Source0: %{name}-2010-06-30.tar.bz2
+#Source0: %{name}-2010-06-30.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-2011-10-22.tar.bz2
 #Original upstream:
 #Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2
 # Modified:
@@ -21,9 +22,10 @@ Patch0: vdrift-SConstruct.patch
 Patch1: vdrift-20071226-paths.patch
 
 Patch4:	vdrift-20090215-joepack-includes.patch
-Patch5: vdrift-20090615-dsolink.patch
+#Patch5: vdrift-20090615-dsolink.patch
 # patch to unbundle bullet, not upstreamable
-Patch6: vdrift-2010-06-30-unbundle.patch
+#Patch6: vdrift-2010-06-30-unbundle.patch
+#Patch7: vdrift-2011-09-09-curl.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
@@ -36,6 +38,8 @@ BuildRequires: glew-devel
 BuildRequires: boost-devel
 BuildRequires: asio-devel
 BuildRequires: bullet-devel
+BuildRequires: libarchive-devel
+BuildRequires: libcurl-devel
 
 Requires: vdrift-data = %{version}
 #Obsoletes:      vdrift-data <= 20071226
@@ -64,7 +68,7 @@ These are the data files.
 
 %prep
 
-%setup -qn vdrift-2010-06-30
+%setup -qn vdrift-2011-10-22
 # unbundling
 rm -rf bullet
 
@@ -75,9 +79,9 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript
 %patch0 -p0
 %patch1 -p0
 %patch4 -p0
-%patch5 -p0
-%patch6 -p0
-
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
 
 #/bin/chmod -x src/gamestate.cpp
 #/bin/chmod -x src/logo.cpp
@@ -131,7 +135,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc docs/*
+%doc README.md LICENSE
 %{_bindir}/vdrift
 %{_datadir}/applications/fedora-vdrift.desktop
 %{_datadir}/icons/hicolor/32x32/apps/vdrift.png
@@ -141,6 +145,10 @@ rm -rf %{buildroot}
 %{_datadir}/vdrift
 
 %changelog
+* Wed Jan 18 2012 Jon Ciesla <limburgher at gmail.com> - 20111022-1
+- New upstream.
+- License changed to GPLv3+.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20100630-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild