dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: vdrift
-# $Id$
-NAME := vdrift
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-5960be8c966bcbde42c054ca667b46ef  vdrift-2009-02-15-src.tar.bz2
+bcb6ae8117134e954be00c8f074167eb  vdrift-2009-06-15-src.tar.bz2

vdrift-20071226-paths.patch

@@ -1,13 +1,7 @@
---- SConstruct	2008-02-13 11:01:59.000000000 -0600
-+++ SConstruct	2008-02-13 11:01:59.000000000 -0600
-@@ -35,8 +35,8 @@
- cppdefines = []
- default_settingsdir = ".vdrift"
- default_prefix = "/usr"
+--- SConstruct~	2009-06-30 13:31:08.000000000 -0500
++++ SConstruct	2009-06-30 13:37:08.000000000 -0500
+@@ -38,2 +38,2 @@
 -default_datadir = "share/games/vdrift/data"
--default_bindir = "share/games/vdrift/bin"
+-default_bindir = "bin"
 +default_datadir = "/share/vdrift"
 +default_bindir = "/bin"
- 
- # convenience var for identifying a windows platform
- 

vdrift.spec

@@ -1,23 +1,19 @@
 Name: vdrift
-Version:  20090215
-Release:  1%{?dist}
+Version:  20090615
+Release:  3%{?dist}
 Summary: Driving/drift racing simulation
 
 Group: Amusements/Games 
 License: GPLv2+
 URL: http://vdrift.net
-Source0: %{name}-2009-02-15-src.tar.bz2
+Source0: %{name}-2009-06-15-src.tar.bz2
 #Original upstream:
-#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-02-15-src.tar.bz2
+#Source0: http://downloads.sourceforge.net/%{name}/%{name}-2009-06-15-src.tar.bz2
 # Modified:
 # cd docs
-# rm HOW_TO_COMPILE.txt SConscript INSTALL
+# rm SConscript INSTALL
 # cd ..
-# rm bullet-2.64/glew32.dll
-# rm bullet-2.64/GLUT32.DLL
-# rm -rf bullet-2.64/Glut
-# rm -rf bullet-2.64/Extras
-# rm -rf bullet-2.64/Demos
+# rm -rf tools/win
 
 Source1: vdrift.desktop
 Source2: vdrift.png
@@ -39,10 +35,12 @@ BuildRequires: jam
 BuildRequires: libvorbis-devel
 BuildRequires: desktop-file-utils
 BuildRequires: glew-devel
+BuildRequires: boost-devel
+BuildRequires: asio-devel
 
-#Requires: vdrift-data = %{version}
-Obsoletes:      vdrift-data <= 20071226
-Provides:       vdrift-data = %{version}-%{release}
+Requires: vdrift-data = %{version}
+#Obsoletes:      vdrift-data <= 20071226
+#Provides:       vdrift-data = %{version}-%{release}
 
 
 %description
@@ -51,9 +49,23 @@ racing in mind. It's powered by the excellent Vamos physics engine. It is
 released under the GNU General Public License (GPL) v2. It is currently
 available for Linux, FreeBSD, Mac OS X and Windows (Cygwin).
 
+%package data
+Summary: Driving/drift racing simulation data
+Group: Amusements/Games 
+Requires: vdrift = %{version}
+BuildArch: noarch
+
+%description data
+VDrift is a cross-platform, open source driving simulation made with drift 
+racing in mind. It's powered by the excellent Vamos physics engine. It is
+released under the GNU General Public License (GPL) v2. It is currently
+available for Linux, FreeBSD, Mac OS X and Windows (Cygwin).
+
+These are the data files.
+
 %prep
 
-%setup -qn vdrift-2009-02-15
+%setup -qn vdrift-2009-06-15
 
 %ifarch ppc ppc64
 sed -i 's/linuxx86/linuxppc/' src/SConscript
@@ -73,8 +85,8 @@ sed -i 's/linuxx86/linuxppc/' src/SConscript
 
 
 %build
-tar -xzf bullet-2.73-sp1.tgz
-/bin/chmod -x bullet-2.73/src/LinearMath/*.h
+#tar -xzf bullet-2.73-sp1.tgz
+#/bin/chmod -x bullet-2.73/src/LinearMath/*.h
 #cd bullet-2.73
 #./autogen.sh
 #./configure
@@ -83,7 +95,7 @@ tar -xzf bullet-2.73-sp1.tgz
 #make
 #cd ..
 
-CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
+CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons bin=/bin prefix=/usr use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
 
 %install
 rm -rf %{buildroot}
@@ -123,12 +135,24 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc docs/*
 %{_bindir}/vdrift
-%{_datadir}/vdrift
 %{_datadir}/applications/fedora-vdrift.desktop
 %{_datadir}/icons/hicolor/32x32/apps/vdrift.png
 
+%files data
+%defattr(-,root,root,-)
+%{_datadir}/vdrift
 
 %changelog
+* Thu Aug 06 2009 Jon Ciesla <limb@jcomserv.net> - 20090615-3
+- Path fix, BZ 515908.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20090615-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 30 2009 Jon Ciesla <limb@jcomserv.net> - 20090615-1
+- Update to 2009-06-15.
+- Split data into noarch subpackage, BZ 508079.
+
 * Thu Feb 19 2009 Jon Ciesla <limb@jcomserv.net> - 20090215-1
 - Update to 2009-02-15.
 - Includes patch.