rpms/torcs/devel torcs-1.2.2-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torcs.spec, 1.1, 1.2
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu Jan 13 18:52:16 UTC 2005
Author: thias
Update of /cvs/extras/rpms/torcs/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10054
Modified Files:
.cvsignore sources torcs.spec
Added Files:
torcs-1.2.2-build.patch
Log Message:
Update to my own version, after approval.
torcs-1.2.2-build.patch:
--- NEW FILE torcs-1.2.2-build.patch ---
diff -Naupr torcs-1.2.2.orig/Make-config torcs-1.2.2/Make-config
--- torcs-1.2.2.orig/Make-config 2004-02-12 19:12:42.000000000 +0100
+++ torcs-1.2.2/Make-config 2004-07-23 18:09:23.050675688 +0200
@@ -47,13 +47,13 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CFLAGSD = -D_SVID_SOURCE -D_BSD_SOURCE -DSHM
-CXXFLAGS = -march=i686 -Wall -Wstrict-prototypes -O3 -mieee-fp -Wall -Wstrict-prototypes -O3 -mieee-fp -march=i686 ${CFLAGSD}
-CFLAGS = -march=i686 -Wall -Wstrict-prototypes -O3 -mieee-fp -Wall -Wstrict-prototypes -O3 -mieee-fp ${CFLAGSD}
+CXXFLAGS = $(RPM_OPT_FLAGS) -fPIC -Wall -mieee-fp -Wall -Wstrict-prototypes ${CFLAGSD}
+CFLAGS = $(RPM_OPT_FLAGS) -fPIC -Wall -mieee-fp -Wall -Wstrict-prototypes ${CFLAGSD}
#EXT_LIBS = -lpthread -lplibssgaux -lplibssg -lplibsm -lplibsl -lplibsg -lplibul -lglut -lGLU -lGL -lpng -lz -ldl -lXxf86vm -lXmu -lXi -lXt -lSM -lICE -lXext -lX11 -lm
EXT_LIBS = -lplibssgaux -lplibssg -lplibsm -lplibsl -lplibsg -lplibul -lglut -lGLU -lGL -lpng -lz -ldl -lXxf86vm -lXmu -lXi -lXt -lSM -lICE -lXext -lX11 -lm
#LDFLAGS = -L/usr/X11R6/lib -L${EXPORTBASE}/lib -L/usr/lib -L/usr/local/lib
-LDFLAGS = -L${EXPORTBASE}/lib -L/usr/X11R6/lib -L/usr/lib
+LDFLAGS = -fPIC -L${EXPORTBASE}/lib -L/usr/X11R6/lib -L/usr/lib
#INCFLAGS = -I${EXPORTBASE}/include -I/usr/include -I/usr/local/include
INCFLAGS = -I${EXPORTBASE}/include
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:28:23 -0000 1.2
+++ .cvsignore 13 Jan 2005 18:52:14 -0000 1.3
@@ -1,8 +1,6 @@
-TORCS-1.2.1-data-cars-Patwo-Design.tgz
-TORCS-1.2.1-data-cars-extra.tgz
-TORCS-1.2.1-data-tracks-base.tgz
-TORCS-1.2.1-data.tgz
-TORCS-1.2.1-src-robots-K1999.tgz
-TORCS-1.2.1-src-robots-base.tgz
-TORCS-1.2.1-src-robots-berniw.tgz
-TORCS-1.2.1-src.tgz
+TORCS-1.2.2-src.tgz
+TORCS-1.2.2-src-robots-base.tgz
+TORCS-1.2.2-src-robots-berniw.tgz
+TORCS-1.2.2-src-robots-billy.tgz
+TORCS-1.2.2-src-robots-bt.tgz
+TORCS-1.2.2-src-robots-K1999.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:28:23 -0000 1.2
+++ sources 13 Jan 2005 18:52:14 -0000 1.3
@@ -1,8 +1,6 @@
-dddb6ffec22c15a9f8c60d0c69a806cf TORCS-1.2.1-data-cars-Patwo-Design.tgz
-1b96f6f9eedda8d1857f9bd112664ab6 TORCS-1.2.1-data-cars-extra.tgz
-afb991a29f875e2030f2ad24d82d2c22 TORCS-1.2.1-data-tracks-base.tgz
-b7c8729b122d1a3bc1fc563783828d12 TORCS-1.2.1-data.tgz
-ee6a5f0099723087585d1295a2d3b48d TORCS-1.2.1-src-robots-K1999.tgz
-f21e4e88c2d6982efb28798d02b1c491 TORCS-1.2.1-src-robots-base.tgz
-df4588752f50eedee7aa0d6f5df74036 TORCS-1.2.1-src-robots-berniw.tgz
-5e43742b252f1e96f8d93da82b8f9fbb TORCS-1.2.1-src.tgz
+cf03f0623eab7f9f7d6b13ac20660515 TORCS-1.2.2-src.tgz
+425b9737f951f95e4255f81b60449f94 TORCS-1.2.2-src-robots-base.tgz
+7e49902b503edb9245c95ffb682bc5c1 TORCS-1.2.2-src-robots-berniw.tgz
+43af2098b788aa96556c8939048ac1b3 TORCS-1.2.2-src-robots-billy.tgz
+e81c9f15a8089b138113621e9e7013d1 TORCS-1.2.2-src-robots-bt.tgz
+b092acfca04bd4708f9722fe0732ba75 TORCS-1.2.2-src-robots-K1999.tgz
Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torcs.spec 8 Nov 2004 05:28:23 -0000 1.1
+++ torcs.spec 13 Jan 2005 18:52:14 -0000 1.2
@@ -1,233 +1,154 @@
-Summary: An OpenGL 3d racing game
-Name: torcs
-Version: 1.2.1
-Release: 0.fdr.9.rh90
-Epoch: 0
-License: GPL
-Group: Amusements/Games
-URL: http://torcs.org/
-Source0: TORCS-%{version}-src.tgz
-Source1: TORCS-%{version}-src-robots-base.tgz
-Source2: TORCS-%{version}-src-robots-berniw.tgz
-Source3: TORCS-%{version}-src-robots-K1999.tgz
-Source4: TORCS-%{version}-data.tgz
-Source5: TORCS-%{version}-data-tracks-base.tgz
-Source6: TORCS-%{version}-data-cars-extra.tgz
-Source7: TORCS-%{version}-data-cars-Patwo-Design.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: XFree86-devel glut-devel zlib-devel libpng-devel desktop-file-utils
-BuildRequires: plib-devel >= 0:1.6.0
-Requires: %{name}-robots %{name}-data
-
-%package robots-base
-Summary: Base robots for torcs
-Group: Amusements/Games
-Provides: %{name}-robots
-Requires: %{name} %{name}-data-cars-extra
-
-%package robots-berniw
-Summary: Berniw robots for torcs
-Group: Amusements/Games
-Provides: %{name}-robots
-Requires: %{name}
-
-%package robots-K1999
-Summary: K1999 robots for torcs
-Group: Amusements/Games
-Provides: %{name}-robots
-Requires: %{name}
-
-%package data
-Summary: Data for torcs
-Group: Amusements/Games
-Requires: %{name}
-Requires: %{name}-robots-base
-
-%package data-tracks
-Summary: Tracks for torcs
-Group: Amusements/Games
-Requires: %{name}
-
-%package data-cars-extra
-Summary: Cars model for torcs
-Group: Amusements/Games
-Requires: %{name}
-
-%package data-cars-Patwo-Design
-Summary: Cars model for torcs
-Group: Amusements/Games
-Requires: %{name}
+%define desktop_vendor fedora
+
+Summary: The Open Racing Car Simulator
+Name: torcs
+Version: 1.2.2
+Release: 4
+License: GPL
+Group: Amusements/Games
+URL: http://torcs.org/
+Source: http://dl.sf.net/torcs/TORCS-%{version}-src.tgz
+Source1: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-base.tgz
+Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz
+Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-K1999.tgz
+Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-billy.tgz
+Source5: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
+Patch: torcs-1.2.2-build.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: torcs-data
+%{?_without_xorg:BuildRequires: XFree86-devel, XFree86-Mesa-libGLU, XFree86-Mesa-libGL}
+%{!?_without_xorg:BuildRequires: xorg-x11-devel, xorg-x11-Mesa-libGLU, xorg-x11-Mesa-libGL}
+BuildRequires: gcc-c++, plib16-devel, freeglut-devel
+BuildRequires: libpng-devel, libjpeg-devel, zlib-devel
+BuildRequires: desktop-file-utils
-#---------------------------------------------------------------------
%description
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-
-%description robots-base
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains some driver bot for torcs
-
-%description robots-berniw
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains some driver bot for torcs
-
-%description robots-K1999
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains some driver bot for torcs
-
-%description data
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains mandatory data for %{name}
-
-%description data-tracks
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains some extra tracks for %{name}
-
-%description data-cars-extra
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains some extra car models
-
-%description data-cars-Patwo-Design
-TORCS is a 3D racing cars simulator using OpenGL. The goal is to have
-programmed robot drivers racing against each others. Nevertheless, a
-joystick interface is present in order to drive yourself.
-This package contains some extra car models
+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.
+
+
+%package robots
+Summary: The Open Racing Car Simulator robots
+Group: Amusements/Games
+Requires: %{name}
+
+%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 -b 1 -b 2 -b 3
+%setup -a 1 -a 2 -a 3 -a 4 -a 5
+%patch -p1 -b .build
+# Put the drivers back where they belong
+%{__mv} %{name}-%{version}/src/drivers/* src/drivers/
+
-#---------------------------------------------------------------------
%build
%configure
-# Race conditions.
-make
+%{__make} %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+
-#---------------------------------------------------------------------
%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-for i in %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
-do
- tar zvxf $i -C $RPM_BUILD_ROOT/%{_datadir}/games/%{name} |\
- sed 's:^\.:%{_datadir}/games/%{name}:g' |\
- sed 's:^\(.\+/\)$:%%dir \1:g' > ${i##*/}.list
-done
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
-install -m 644 -D Ticon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-cat > %{name}.desktop << EOF
+%{__install} -m 644 -D Ticon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+
+%{__cat} > %{name}.desktop << EOF
[Desktop Entry]
Name=TORCS
-Comment=An OpenGL 3d racing game
-Exec=%{name}
-Icon=%{name}.png
+Comment=The Open Racing Car Simulator
+Exec=torcs
+Icon=torcs.png
Terminal=false
Type=Application
Encoding=UTF-8
+Categories=Application;Game;
EOF
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- --add-category Application \
- --add-category Game \
- %{name}.desktop
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor %{desktop_vendor} \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{name}.desktop
+
+# We need this for proper automatic stripping to take place
+find %{buildroot}%{_libdir}/%{name} -name '*.so' | xargs %{__chmod} +x
+
-#---------------------------------------------------------------------
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+
-#---------------------------------------------------------------------
%files
-%defattr(-,root,root,-)
-%doc COPYING CHANGELOG.html
-%{_bindir}/gennmtab
-%{_bindir}/%{name}
-%{_libdir}/lib*.so
-%dir %{_datadir}/games
+%defattr(-, root, root, 0755)
+%doc CHANGELOG.html COPYING README.linux TODO.html
+%{_bindir}/*
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/drivers
+%{_libdir}/%{name}/drivers/human
+%{_libdir}/%{name}/lib
+%{_libdir}/%{name}/modules
+%{_libdir}/%{name}/setup_linux.sh
+%{_libdir}/%{name}/*-bin
+%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
%dir %{_datadir}/games/%{name}
-%dir %{_datadir}/games/%{name}/drivers
-%dir %{_datadir}/games/%{name}/tracks
-%{_datadir}/games/%{name}/%{name}
%{_datadir}/games/%{name}/config
-%{_datadir}/games/%{name}/modules
-%{_datadir}/games/%{name}/setup_linux.sh
-%{_datadir}/games/%{name}/telemetry
+%dir %{_datadir}/games/%{name}/drivers
%{_datadir}/games/%{name}/drivers/human
+%{_datadir}/games/%{name}/results
+%{_datadir}/games/%{name}/telemetry
%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/*%{name}.desktop
-%files robots-base
-%defattr(-,root,root,-)
-%{_datadir}/games/%{name}/drivers/tita
-%{_datadir}/games/%{name}/drivers/tanhoj
-%{_datadir}/games/%{name}/drivers/lliaw
-%{_datadir}/games/%{name}/drivers/inferno*
-%{_datadir}/games/%{name}/drivers/damned
-%{_datadir}/games/%{name}/drivers/cylos1
-
-%files robots-berniw
-%defattr(-,root,root,-)
-%{_datadir}/games/%{name}/drivers/berniw2
-%{_datadir}/games/%{name}/drivers/berniw
-
-%files robots-K1999
-%defattr(-,root,root,-)
-%{_datadir}/games/%{name}/drivers/K1999
-
-%files data -f TORCS-%{version}-data.tgz.list
-%defattr(-,root,root,-)
-
-%files data-tracks -f TORCS-%{version}-data-tracks-base.tgz.list
-%defattr(-,root,root,-)
-%files data-cars-extra -f TORCS-%{version}-data-cars-extra.tgz.list
-%defattr(-,root,root,-)
+%files robots
+%defattr(-, root, root, 0755)
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/drivers
+# Easier this way, since we package them all-minus-one in ;-)
+%exclude %{_libdir}/%{name}/drivers/human
+%dir %{_datadir}/games/%{name}
+%{_datadir}/games/%{name}/drivers
+%exclude %{_datadir}/games/%{name}/drivers/human
-%files data-cars-Patwo-Design -f TORCS-%{version}-data-cars-Patwo-Design.tgz.list
-%defattr(-,root,root,-)
-#---------------------------------------------------------------------
%changelog
-* Mon Jul 7 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.9
-- Added missing directories
-
-* Sat Jun 28 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.8
-- removed ugliness in SourceX tags
-
-* Fri Jun 27 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.7
-- Added missing dep
-
-* Thu Jun 26 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.6
-- Removed URL in Source tags.
-- Added Encoding for the desktop entry
-- buildroot -> RPM_BUILD_ROOT
+* Fri Nov 5 2004 Matthias Saou <http://freshrpms.net/> 1.2.2-4
+- Add +x chmod'ing to .so files in order to get them stripped properly.
-* Thu Jun 26 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.5
-- data now requires robots-base package
+* Mon Oct 25 2004 Matthias Saou <http://freshrpms.net/> 1.2.2-3
+- Remove un-needed /sbin/ldconfig calls.
-* Thu May 1 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.4
-- Added dir entry in main package
+* Fri Jul 23 2004 Matthias Saou <http://freshrpms.net/> 1.2.2-3
+- Change build dependency of plib to compat package plib16-devel as
+ rebuilding against 1.8 is not currently possible.
+- Add patch for -fPIC to fix x86_64 build (hmm, doesn't work).
+
+* Thu May 20 2004 Matthias Saou <http://freshrpms.net/> 1.2.2-2
+- Rebuild for Fedora Core 2.
+- Change XFree86 deps to xorg-x11 and glut to freeglut.
+
+* Thu Feb 26 2004 Matthias Saou <http://freshrpms.net/> 1.2.2-1
+- Update to 1.2.2.
+- No longer require compat-libstdc++-devel for building.
+- This version broke %%makeinstall, so switch to DESTDIR method.
+- Re-enabled K1999 build, it works again.
+- Added new robots : billy and bt.
+
+* Tue Jan 13 2004 Matthias Saou <http://freshrpms.net/> 1.2.1-4
+- Work around the XFree86 dependency problem by adding XFree86-Mesa-libGLU.
+
+* Tue Dec 2 2003 Matthias Saou <http://freshrpms.net/> 1.2.1-3
+- Rebuild for Fedora Core 1.
+- Disabled build of the K1999 driver (strstream.h seems obsolete).
-* Fri Apr 25 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.3
-- Added dir entries according to discussion on bugzilla entry #203
+* Tue May 27 2003 Matthias Saou <http://freshrpms.net/>
+- Added a torcs requirement to the robots package.
-* Fri Apr 25 2003 Dams <anvil[AT]livna.org> 0:1.2.1-0.fdr.2
-- Stole Desktop entry from Freshrpms spec file
+* Wed Apr 23 2003 Matthias Saou <http://freshrpms.net/>
+- Initial RPM release.
-* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
-- Initial build.
More information about the fedora-extras-commits
mailing list