From 76a7287f94eb07a04b8dd07085cb7574189d9b42 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Nov 10 2006 13:52:01 +0000 Subject: Update to 1.3.0. --- diff --git a/.cvsignore b/.cvsignore index 5eecd72..8c0b022 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,5 @@ -TORCS-1.2.4-src-robots-base.tgz -TORCS-1.2.4-src-robots-berniw.tgz -TORCS-1.2.4-src-robots-bt.tgz -TORCS-1.2.4-src-robots-olethros.tgz -TORCS-1.2.4-src.tgz +TORCS-1.3.0-src.tgz +TORCS-1.3.0-src-robots-base.tgz +TORCS-1.3.0-src-robots-berniw.tgz +TORCS-1.3.0-src-robots-bt.tgz +TORCS-1.3.0-src-robots-olethros.tgz diff --git a/sources b/sources index b29676d..12b618b 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -3afe0d23f1e637fe56efccd2b6e8a8f1 TORCS-1.2.4-src-robots-base.tgz -40aed9595f91051e8468e8a19b65f809 TORCS-1.2.4-src-robots-berniw.tgz -337eecc6e545aceda094d945e12c3023 TORCS-1.2.4-src-robots-bt.tgz -13b1eeba1148ca57dc1d989fcb27d308 TORCS-1.2.4-src-robots-olethros.tgz -f5b41bf29cb7b6160e5ead6e187380b6 TORCS-1.2.4-src.tgz +915c89f9d3618d13dddd5bfb4d199539 TORCS-1.3.0-src.tgz +da007d61447f38fbdbd22aec029cc26c TORCS-1.3.0-src-robots-base.tgz +abeb72ba3913ef0bde727fdaa9699eef TORCS-1.3.0-src-robots-berniw.tgz +ca8506aecc30bee308a5e198304b71b2 TORCS-1.3.0-src-robots-bt.tgz +227d47687b821298fe6b2f147071e73f TORCS-1.3.0-src-robots-olethros.tgz diff --git a/torcs-1.2.4-extraqualif.patch b/torcs-1.2.4-extraqualif.patch deleted file mode 100644 index 3396aee..0000000 --- a/torcs-1.2.4-extraqualif.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naupr torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h ---- torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h 2005-08-24 21:19:47.000000000 +0200 -+++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h 2006-03-10 16:50:51.000000000 +0100 -@@ -78,7 +78,7 @@ public: - - void update(tSituation *s, float Fps); - -- void cGrScreen::camDraw(tSituation *s); -+ void camDraw(tSituation *s); - - void updateCurrent(tSituation *s); - diff --git a/torcs-1.2.4-track_cpp.patch b/torcs-1.2.4-track_cpp.patch deleted file mode 100644 index d11deac..0000000 --- a/torcs-1.2.4-track_cpp.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/tools/trackgen/track.orig.cpp 2005-08-24 14:19:48.000000000 -0500 -+++ src/tools/trackgen/track.cpp 2005-10-04 02:15:55.000000000 -0500 -@@ -392,7 +392,7 @@ - trackvertices[3*nbvert] = x; \ - trackvertices[3*nbvert+1] = y; \ - trackvertices[3*nbvert+2] = z; \ -- trackindices[nbvert] = nbvert++; \ -+ trackindices[nbvert] = nbvert+1; \ - } \ - } while (0) - -@@ -403,7 +403,7 @@ - trackvertices[3*nbvert] = x; \ - trackvertices[3*nbvert+1] = y; \ - trackvertices[3*nbvert+2] = z; \ -- trackindices[nbvert] = nbvert++; \ -+ trackindices[nbvert] = nbvert+1; \ - printf("x=%f y=%f z=%f u=%f v=%f\n", \ - (tdble)(x), (tdble)(y), (tdble)(z), \ - (tdble)(t1), (tdble)(t2)); \ diff --git a/torcs.spec b/torcs.spec index d04147c..5c57ad4 100644 --- a/torcs.spec +++ b/torcs.spec @@ -2,8 +2,8 @@ Summary: The Open Racing Car Simulator Name: torcs -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -13,8 +13,6 @@ Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz Patch0: torcs-1.2.4-freealutfix.patch -Patch1: torcs-1.2.4-track_cpp.patch -Patch2: torcs-1.2.4-extraqualif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3 @@ -37,7 +35,7 @@ yourself with either a wheel, keyboard or mouse. %package robots Summary: The Open Racing Car Simulator robots Group: Amusements/Games -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description robots TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -50,20 +48,19 @@ This package contains the robots who can race on their own. %prep %setup -a 1 -a 2 -a 3 -a 4 %patch0 -p1 -b .freealutfix -%patch1 -p0 -b .track_cpp -%patch2 -p1 -b .extraqualif # Put the drivers back where they belong %{__mv} %{name}-%{version}/src/drivers/* src/drivers/ %build -# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4) +# Force locations with modular X (for FC5+ and non-Fedora) +# Required (1.2.4, still in 1.3.0) %configure \ %if %{!?fedora:5}%{?fedora} >= 5 --x-includes=%{_includedir} \ --x-libraries=%{_libdir} %endif -# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4 +# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0 %{__make} @@ -90,7 +87,7 @@ desktop-file-install --vendor %{desktop_vendor} \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop -# We need this for proper automatic stripping to take place (still in 1.2.3) +# We need this for proper automatic stripping to take place (still in 1.3.0) find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x @@ -100,7 +97,7 @@ find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x %files %defattr(-, root, root, 0755) -%doc CHANGELOG.html COPYING README.linux TODO.html +%doc COPYING README README.linux %{_bindir}/* %dir %{_libdir}/%{name}/ %dir %{_libdir}/%{name}/drivers/ @@ -163,6 +160,11 @@ find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x %changelog +* Fri Nov 10 2006 Matthias Saou 1.3.0-1 +- Update to 1.3.0. +- Remove no longer needed track.cpp patch1. +- Remove no longer needed extraqualif patch2. + * Mon Aug 28 2006 Matthias Saou 1.2.4-4 - FC6 rebuild.