rpms/torcs/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 torcs.spec, 1.23, 1.24 torcs-1.2.4-freealutfix.patch, 1.1, NONE torcs-1.3.0-consts.patch, 1.1, NONE torcs-1.3.0-gcc43.patch, 1.1, NONE

[Matthias Saou]

Author: thias

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

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-freealutfix.patch torcs-1.3.0-consts.patch 
	torcs-1.3.0-gcc43.patch 
Log Message:
Update to 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 13:52:01 -0000	1.6
+++ .cvsignore	10 Apr 2009 21:17:59 -0000	1.7
@@ -1,5 +1,2 @@
-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
+TORCS-1.3.1-src.tgz
+TORCS-1.3.1-src-robots-base.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 13:52:01 -0000	1.6
+++ sources	10 Apr 2009 21:17:59 -0000	1.7
@@ -1,5 +1,2 @@
-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
+91f2296213fbfb1f1971dee7535af9bc  TORCS-1.3.1-src.tgz
+cf3cc25f774c1793446af432ff9fc704  TORCS-1.3.1-src-robots-base.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- torcs.spec	1 Mar 2009 19:48:56 -0000	1.23
+++ torcs.spec	10 Apr 2009 21:18:00 -0000	1.24
@@ -1,26 +1,25 @@
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.3.0
-Release: 10%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Amusements/Games
 URL: http://torcs.org/
-Source: http://downloads.sf.net/torcs/TORCS-%{version}-src.tgz
+Source0: http://downloads.sf.net/torcs/TORCS-%{version}-src.tgz
 Source1: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz
-Source2: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
-Source3: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
-Source4: http://downloads.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
-Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.3.0-gcc43.patch
-Patch2: torcs-1.3.0-consts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
+Requires: torcs-data
+Requires: torcs-data-tracks-road
+Requires: torcs-data-cars-extra
 Requires: opengl-games-utils
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel
 BuildRequires: libXxf86vm-devel, libXrandr-devel, libXrender-devel
+# We used to provide a separate "robots" sub-package up to 1.3.0 included
+Obsoletes: torcs-robots <= 1.3.0
+Provides: torcs-robots = %{version}-%{release}
 
 %description
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -28,35 +27,17 @@
 yourself with either a wheel, keyboard or mouse.
 
 
-%package robots
-Summary: The Open Racing Car Simulator robots
-Group: Amusements/Games
-Requires: %{name} = %{version}-%{release}
-
-%description robots
-TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
-programmed robots drivers racing against each others.  You can also drive
-yourself with either a wheel, keyboard or mouse.
-
-This package contains the robots who can race on their own.
-
-
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4
+%setup -q -a 1
+# Prevent useless executable files in the debuginfo package (as of 1.3.1)
+%{__chmod} -x src/libs/learning/policy.*
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
-%patch0 -p1 -b .freealutfix
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .consts
 
 
 %build
-# Force locations with modular X
-# Required (1.2.4, still in 1.3.0)
-%configure \
-    --x-includes=%{_includedir} \
-    --x-libraries=%{_libdir}
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
+%configure
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.1
 %{__make}
 
 
@@ -99,19 +80,23 @@
 %files
 # Directory default mode of 0755 is MANDATORY, since installed dirs are 0777
 %defattr(-,root,root,0755)
-%doc COPYING README README.linux
+%doc COPYING README
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
 # From main
 %{_libdir}/%{name}/drivers/human/
 # From robots-base
-%{_libdir}/%{name}/drivers/cylos1/
+%{_libdir}/%{name}/drivers/berniw/
+%{_libdir}/%{name}/drivers/berniw2/
+%{_libdir}/%{name}/drivers/berniw3/
+%{_libdir}/%{name}/drivers/bt/
 %{_libdir}/%{name}/drivers/damned/
 %{_libdir}/%{name}/drivers/inferno/
 %{_libdir}/%{name}/drivers/inferno2/
 %{_libdir}/%{name}/drivers/lliaw/
-%{_libdir}/%{name}/drivers/tanhoj/
+%{_libdir}/%{name}/drivers/olethros/
+%{_libdir}/%{name}/drivers/sparkle/
 %{_libdir}/%{name}/drivers/tita/
 %{_libdir}/%{name}/lib/
 %{_libdir}/%{name}/modules/
@@ -124,45 +109,28 @@
 # From main
 %{_datadir}/games/%{name}/drivers/human/
 # From robots-base
-%{_datadir}/games/%{name}/drivers/cylos1/
+%{_datadir}/games/%{name}/drivers/berniw/
+%{_datadir}/games/%{name}/drivers/berniw2/
+%{_datadir}/games/%{name}/drivers/berniw3/
+%{_datadir}/games/%{name}/drivers/bt/
 %{_datadir}/games/%{name}/drivers/damned/
 %{_datadir}/games/%{name}/drivers/inferno/
 %{_datadir}/games/%{name}/drivers/inferno2/
 %{_datadir}/games/%{name}/drivers/lliaw/
-%{_datadir}/games/%{name}/drivers/tanhoj/
+%{_datadir}/games/%{name}/drivers/olethros/
+%{_datadir}/games/%{name}/drivers/sparkle/
 %{_datadir}/games/%{name}/drivers/tita/
 %{_datadir}/games/%{name}/results/
 %{_datadir}/games/%{name}/telemetry/
 %{_datadir}/pixmaps/%{name}.png
 
-%files robots
-# Directory default mode of 0755 is MANDATORY, since installed dirs are 0777
-%defattr(-,root,root,0755)
-%dir %{_libdir}/%{name}/
-%dir %{_libdir}/%{name}/drivers/
-# From robots-berniw
-%{_libdir}/%{name}/drivers/berniw/
-%{_libdir}/%{name}/drivers/berniw2/
-%{_libdir}/%{name}/drivers/berniw3/
-%{_libdir}/%{name}/drivers/sparkle/
-# From robots-bt
-%{_libdir}/%{name}/drivers/bt/
-# From robots-olethros
-%{_libdir}/%{name}/drivers/olethros/
-%dir %{_datadir}/games/%{name}/
-%dir %{_datadir}/games/%{name}/drivers/
-# From robots-berniw
-%{_datadir}/games/%{name}/drivers/berniw/
-%{_datadir}/games/%{name}/drivers/berniw2/
-%{_datadir}/games/%{name}/drivers/berniw3/
-%{_datadir}/games/%{name}/drivers/sparkle/
-# From robots-bt
-%{_datadir}/games/%{name}/drivers/bt/
-# From robots-olethros
-%{_datadir}/games/%{name}/drivers/olethros/
-
 
 %changelog
+* Fri Apr 10 2009 Matthias Saou <http://freshrpms.net/> 1.3.1-1
+- Update to 1.3.1.
+- Remove the drivers sub-package since only one is provided upstream now and
+  it's mandatory (all of the separate drivers seem to be merged there now).
+
 * Sun Mar 01 2009 Caolán McNamara <caolanm at redhat.com> - 1.3.0-10
 - constify ret of strchr(const *char)
 


--- torcs-1.2.4-freealutfix.patch DELETED ---


--- torcs-1.3.0-consts.patch DELETED ---


--- torcs-1.3.0-gcc43.patch DELETED ---