rpms/torcs/devel torcs.spec,1.14,1.15

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16769

Modified Files:
	torcs.spec 
Log Message:
Update License field.



Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- torcs.spec	10 Nov 2006 13:52:01 -0000	1.14
+++ torcs.spec	6 Aug 2007 09:58:00 -0000	1.15
@@ -1,10 +1,8 @@
-%define desktop_vendor fedora
-
 Summary: The Open Racing Car Simulator
 Name: torcs
 Version: 1.3.0
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPLv2+
 Group: Amusements/Games
 URL: http://torcs.org/
 Source: http://dl.sf.net/torcs/TORCS-%{version}-src.tgz
@@ -18,13 +16,8 @@
 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
-# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 5
 BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel
 BuildRequires: libXxf86vm-devel, libXrandr-devel, libXrender-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
 
 %description
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -46,20 +39,18 @@
 
 
 %prep
-%setup -a 1 -a 2 -a 3 -a 4
+%setup -q -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
 # 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)
+# Force locations with modular X
 # 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.3.0
 %{__make}
 
@@ -79,11 +70,12 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;Game;
+Categories=Game;
 EOF
 
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} \
+desktop-file-install \
+    --vendor "" \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -96,7 +88,8 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+# Directory default mode of 0755 is MANDATORY, since installed dirs are 0777
+%defattr(-,root,root,0755)
 %doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
@@ -115,7 +108,7 @@
 %{_libdir}/%{name}/modules/
 %{_libdir}/%{name}/setup_linux.sh
 %{_libdir}/%{name}/*-bin
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %dir %{_datadir}/games/%{name}/
 %{_datadir}/games/%{name}/config/
 %dir %{_datadir}/games/%{name}/drivers/
@@ -134,7 +127,8 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %files robots
-%defattr(-, root, root, 0755)
+# 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
@@ -160,6 +154,11 @@
 
 
 %changelog
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.3.0-2
+- Update License field.
+- Minor spec file cleanups.
+- Minor desktop file cleanups.
+
 * Fri Nov 10 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-1
 - Update to 1.3.0.
 - Remove no longer needed track.cpp patch1.