rpms/vdrift/devel vdrift.spec,1.11,1.12

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/vdrift/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28544

Modified Files:
	vdrift.spec 
Log Message:
* Tue Oct 21 2008 Hans de Goede <hdegoede at redhat.com> - 20080805-2
- Actually install the data now that its merged into the main package



Index: vdrift.spec
===================================================================
RCS file: /cvs/extras/rpms/vdrift/devel/vdrift.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vdrift.spec	13 Aug 2008 19:19:14 -0000	1.11
+++ vdrift.spec	21 Oct 2008 11:07:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name: vdrift
 Version:  20080805
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: VDrift is a cross-platform, open source driving/drift racing simulation
 
 Group: Amusements/Games 
@@ -77,12 +77,16 @@
 jam bulletcollision bulletmath
 cd ..
 
-CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons destdir=%{buildroot} 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 use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
 
 %install
 rm -rf %{buildroot}
+# As described in the README scons install is broken so DIY
 install -d %{buildroot}%{_bindir}
-CC="gcc" CXX="g++" CXXFLAGS="%{optflags}" scons install destdir=%{buildroot} bin=/bin use_binreloc=0 release=1 os_cc=1 os_cxx=1 os_cxxflags=1 NLS=0
+install -d %{buildroot}%{_datadir}
+install -m 755 build/vdrift %{buildroot}%{_bindir}
+cp -pr data %{buildroot}%{_datadir}/vdrift
+rm `find %{buildroot}%{_datadir}/vdrift -name "SConscript*"`
 
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -111,13 +115,17 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/vdrift
 %doc docs/*
+%{_bindir}/vdrift
+%{_datadir}/vdrift
 %{_datadir}/applications/fedora-vdrift.desktop
 %{_datadir}/icons/hicolor/32x32/apps/vdrift.png
 
 
 %changelog
+* Tue Oct 21 2008 Hans de Goede <hdegoede at redhat.com> - 20080805-2
+- Actually install the data now that its merged into the main package
+
 * Tue Aug 12 2008 Jon Ciesla <limb at jcomserv.net> - 20080805-1
 - Update to new upstream.
 - Dropped gcc4.3 and jamfile patches, applied upstream.