packages: toycars/toycars.spec - up to 0.3.10 - track and vehicle editors a...

[lisu]

Author: lisu                         Date: Wed Aug  5 13:35:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.3.10
- track and vehicle editors are now included into package
- fix gcc-4.4+/glibc-2.10+ combination problem (gcc.patch)
- case_brackets.patch applied upstream

---- Files affected:
packages/toycars:
   toycars.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/toycars/toycars.spec
diff -u packages/toycars/toycars.spec:1.12 packages/toycars/toycars.spec:1.13
--- packages/toycars/toycars.spec:1.12	Mon Mar 23 13:36:13 2009
+++ packages/toycars/toycars.spec	Wed Aug  5 15:35:10 2009
@@ -2,26 +2,17 @@
 # NOTE:
 # There is no sound since version 0.3.4, because sound system requires FMOD Ex library to run. Everyone who wants sound can install FMOD Ex on one's own.
 #
-# Conditional build
-%bcond_without	editors		# don't build track and vehicle editors
-#
-%define 	track_editor_ver	0.1.2
-%define		vehicle_editor_ver	0.1.0
 Summary:	Physics-based 2D racing game
 Summary(pl.UTF-8):	Gra wyścigowa 2D oparta na prawach fizyki
 Name:		toycars
-Version:	0.3.9
+Version:	0.3.10
 Release:	1
 License:	BSD
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/toycars/%{name}-%{version}.tar.gz
-# Source0-md5:	6fd6baf4389007ca59fddc33c6b3e631
-Source1:	http://dl.sourceforge.net/toycars/%{name}_track_editor-%{track_editor_ver}.tar.gz
-# Source1-md5:	ec55e35b88cfbbba7e24f799dfe5691d
-Source2:	http://dl.sourceforge.net/toycars/%{name}_vehicle_editor-%{vehicle_editor_ver}.tar.gz
-# Source2-md5:	f443638a8d535b99b47316c6edca3efd
-Source3:	%{name}.desktop
-Patch0:		%{name}-case_brackets.patch
+# Source0-md5:	6b0b7506ee5623081e002c8690c5bc78
+Source1:	%{name}.desktop
+Patch0:		%{name}-gcc.patch
 URL:		http://sourceforge.net/projects/toycars/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL-devel >= 1.2.10
@@ -29,7 +20,7 @@
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
-%{?with_editors:BuildRequires:	fltk-gl-devel}
+BuildRequires:	fltk-gl-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,16 +35,9 @@
 Jupiter's Masterdrive na Atari ST.
 
 %prep
-%setup -q -a 1 -a 2
-%if %{with editors}
+%setup -q
 %patch0 -p1
-%endif
-
-%if %{with editors}
-# copy the same file instead of patching it again
-cp src/Startline.cpp %{name}_track_editor-%{track_editor_ver}/src
-%{__perl} -pi -e 's at Fl/@FL/@' %{name}_track_editor-%{track_editor_ver}/src/TrackView.cxx
-%endif
+%{__perl} -pi -e 's at Fl/@FL/@' %{name}_track_editor/src/TrackView.cxx
 
 %build
 %{__aclocal} -I m4
@@ -63,25 +47,6 @@
 %configure
 %{__make}
 
-%if %{with editors}
-cd %{name}_track_editor-%{track_editor_ver}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-%{__make}
-
-cd ..
-cd %{name}_vehicle_editor-%{vehicle_editor_ver}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
-%{__make}
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
@@ -89,20 +54,15 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install data/images/title.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
-%if %{with editors}
-	install %{name}_track_editor-%{track_editor_ver}/src/%{name}_track_editor $RPM_BUILD_ROOT%{_bindir}
-	install %{name}_vehicle_editor-%{vehicle_editor_ver}/src/%{name}_vehicle_editor $RPM_BUILD_ROOT%{_bindir}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog README
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
@@ -114,6 +74,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/08/05 13:35:10  lisu
+- up to 0.3.10
+- track and vehicle editors are now included into package
+- fix gcc-4.4+/glibc-2.10+ combination problem (gcc.patch)
+- case_brackets.patch applied upstream
+
 Revision 1.12  2009/03/23 12:36:13  lisu
 - up to 0.3.9
 - track editor updated to 0.1.2
@@ -129,7 +95,6 @@
 - add track editor - it's separate project, but some files are the same
 - bcond for track editor (on by default)
 - BR: fltk-gl-devel for track editor
-
 Revision 1.9  2008/11/25 13:56:16  lisu
 - 0.3.7
 - assert.patch is unneeded
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/toycars/toycars.spec?r1=1.12&r2=1.13&f=u