.gitignore

@@ -3,5 +3,3 @@ vdrift-2009-06-15-src.tar.bz2
 /vdrift-2011-10-22.tar.bz2
 /vdrift-2012-07-22.tar.bz2
 /vdrift-2014-10-20.tar.bz2
-/vdrift-5ae309f.tar.gz
-/vdrift-data-20210211.tar.xz

sources

@@ -1,2 +1 @@
-SHA512 (vdrift-5ae309f.tar.gz) = 54f578e70ef6a9b8d8697ad842b803adfff77230a392bb4e069469422f472571f2b47a6a87aecb46bf17f3d2cafce2a3989857fda43030ad67e5b6d9a8c13953
-SHA512 (vdrift-data-20210211.tar.xz) = d7beece201129b7be8cdca4d1d4e84c9656f2d6a03650f6576dad29d8231367402e7d32d4e24df22cbce2af842c930b8ed9492e4a1e7e480fe7569acdd992cf5
+524751fab341b36f59d0747ea52f0c41  vdrift-2014-10-20.tar.bz2

vdrift-20141020-gcc6.patch

@@ -0,0 +1,12 @@
+diff -up ./src/graphics/model_obj.cpp.gcc6 ./src/graphics/model_obj.cpp
+--- ./src/graphics/model_obj.cpp.gcc6	2016-02-09 19:02:50.282554264 -0500
++++ ./src/graphics/model_obj.cpp	2016-02-09 19:03:10.566308088 -0500
+@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string &
+ 	std::ofstream f(strFileName.c_str());
+ 	if (!f)
+ 	{
+-		error_output << "Error opening file for writing: " << error_output << endl;
++		error_output << "Error opening file for writing: " << strFileName << endl;
+ 		return false;
+ 	}
+ 

vdrift-python3.patch

@@ -0,0 +1,83 @@
+--- SConstruct~	2019-08-02 16:20:27.000000000 -0500
++++ SConstruct	2019-08-02 16:20:59.703964106 -0500
+@@ -518,7 +518,7 @@
+ Export(['env', 'version', 'src_dir', 'bin_dir'])
+ if 'install' in COMMAND_LINE_TARGETS:
+     if not os.path.isfile('data/SConscript'):
+-        raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' 
++        print 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' 
+     SConscript('data/SConscript')
+     # desktop appdata installation
+     install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop')
+--- SConstruct.bak	2019-08-02 16:25:00.652707553 -0500
++++ SConstruct	2019-08-02 16:25:21.205679013 -0500
+@@ -92,9 +92,9 @@
+ 
+     for a in env['universal']:
+         if not sdk_path:
+-            print 'Building a universal binary require access to an ' + \
++            print('Building a universal binary require access to an ' + \
+                 'SDK that has universal \nbinary support.If you know ' + \
+-                'the location of such an SDK, specify it using the \n"SDK" option'
++                'the location of such an SDK, specify it using the \n"SDK" option')
+             Exit(1)
+         env.Append( CCFLAGS = ['-arch', a],  LINKFLAGS = ['-arch', a] )
+ 
+@@ -141,11 +141,11 @@
+         CC = 'gcc', CXX = 'g++',
+         options = opts)
+     # Take environment variables into account
+-    if os.environ.has_key('CXX'):
++    if 'CXX' in os.environ:
+         env['CXX'] = os.environ['CXX']
+-    if os.environ.has_key('CXXFLAGS'):
++    if 'CXXFLAGS' in os.environ:
+         env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+-    if os.environ.has_key('LDFLAGS'):
++    if 'LDFLAGS' in os.environ:
+         env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+     check_headers = ['GL/gl.h', 'SDL2/SDL.h', 'SDL2/SDL_image.h', 'vorbis/vorbisfile.h', 'curl/curl.h', 'bullet/btBulletCollisionCommon.h', 'bullet/btBulletDynamicsCommon.h']
+     check_libs = []
+@@ -232,7 +232,7 @@
+ def tarballer (target, source, env):            
+     cmd = 'tar -jcf "%s" -C "%s" .'  % ( str(target[0]), str(source[0]) )
+     #cmd = 'tar -jcf ' + str (target[0]) +  ' ' + str(source[0]) + "  --exclude '*~' "
+-    print 'running ', cmd, ' ... '
++    print('running ', cmd, ' ... ')
+     p = os.popen (cmd)
+     return p.close ()
+ 
+@@ -362,11 +362,11 @@
+ conf = Configure(env)
+ for header in check_headers:
+     if not conf.CheckCXXHeader(header):
+-        print 'You do not have the %s headers installed. Exiting.' % header
++        print('You do not have the %s headers installed. Exiting.' % header)
+         Exit(1)
+ for lib in check_libs:
+     if not conf.CheckLibWithHeader(lib[0], lib[1], 'C', lib[2]):
+-        print lib[3]
++        print(lib[3])
+         Exit(1)
+ 
+ env = conf.Finish()
+@@ -518,7 +518,7 @@
+ Export(['env', 'version', 'src_dir', 'bin_dir'])
+ if 'install' in COMMAND_LINE_TARGETS:
+     if not os.path.isfile('data/SConscript'):
+-        print 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.' 
++        print('VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.') 
+     SConscript('data/SConscript')
+     # desktop appdata installation
+     install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop')
+--- src/SConscript~	2014-09-04 15:06:21.000000000 -0500
++++ src/SConscript	2019-08-03 09:51:18.019800029 -0500
+@@ -151,7 +151,7 @@
+ 		utils.cpp
+ 		window.cpp""")
+ 
+-src.sort(lambda x, y: cmp(x.lower(),y.lower()))
++#src.sort(lambda x, y: cmp(x.lower(),y.lower()))
+ 
+ #------------------------#
+ # Copy Build Environment #

vdrift.spec

@@ -1,24 +1,17 @@
-%global commit 5ae309f1048c863f4745cd50c8cd81f98340b1d4
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name: vdrift
 Version:  20141020
-Release:  36.git%{shortcommit}%{?dist}
+Release:  21%{?dist}
 Summary: Driving/drift racing simulation
 
-License: GPL-3.0-or-later
+License: GPLv3+
 URL: http://vdrift.net
-Source0: https://github.com/VDrift/vdrift/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-2014-10-20.tar.bz2
 Source1: vdrift.desktop
 Source2: vdrift.png
-# Data
-# svn checkout https://svn.code.sf.net/p/vdrift/code/ vdrift-code
-# mv vdrift-code/vdrift-data data
-# tar cvfJ vdrift-data-20210211.tar.xz data
-Source3: vdrift-data-20210211.tar.xz
-
 Patch1: vdrift-20071226-paths.patch
 Patch4:	vdrift-20090215-joepack-includes.patch
+Patch10: vdrift-20141020-gcc6.patch
+Patch11: vdrift-python3.patch
 BuildRequires: mesa-libGL-devel
 BuildRequires: SDL2-devel
 BuildRequires: SDL2_image-devel
@@ -59,7 +52,7 @@ These are the data files.
 
 %prep
 
-%setup -qn vdrift-%{commit} -a 3
+%setup -qn vdrift
 # unbundling
 rm -rf bullet
 
@@ -67,16 +60,18 @@ rm -rf bullet
 sed -i 's/linuxx86/linuxppc/' src/SConscript
 %endif
 
-%patch -P 1 -p0
-%patch -P 4 -p0
-%py3_shebang_fix .
+%patch1 -p0
+%patch4 -p0
+%patch10 -p0 -b .gcc6
+%patch11 -p0
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
 
 /bin/chmod -x src/main.cpp
 /bin/chmod -x src/game.cpp
 
 
 %build
-scons %{?_smp_mflags}
+scons-3 %{?_smp_mflags}
 
 %install
 # As described in the README scons install is broken so DIY
@@ -144,52 +139,6 @@ EOF
 %{_datadir}/vdrift
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-36.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-35.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-34.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-33.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-32.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-31.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-30.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Mar 04 2023 Gwyn Ciesla <gwync@protonmail.com> - 20141020-29.git5ae309f
-- migrated to SPDX license
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-28.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-27.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-26.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-25.git5ae309f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Feb 11 2021 Tom Callaway <spot@fedoraproject.org> - 20141020-24.git5ae309f
-- update code to latest git
-- update data from latest svn
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20141020-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
 * Mon Mar 23 2020 Gwyn Ciesla <gwync@protonmail.com> - 2014-1020-21
 - Change build options to fix crash.