SPECS: toycars.spec - up to 0.3.8 - track_editor up to 0.1.1 - add vehicle_...

[lisu]

Author: lisu                         Date: Wed Mar  4 13:22:59 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.3.8
- track_editor up to 0.1.1
- add vehicle_editor and make editors bcond provide for it

---- Files affected:
SPECS:
   toycars.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/toycars.spec
diff -u SPECS/toycars.spec:1.10 SPECS/toycars.spec:1.11
--- SPECS/toycars.spec:1.10	Tue Nov 25 16:54:28 2008
+++ SPECS/toycars.spec	Wed Mar  4 14:22:54 2009
@@ -3,21 +3,24 @@
 # 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	editor	# don't build track editor
+%bcond_without	editors		# don't build track and vehicle editors
 #
-%define 	editor_ver	0.1.0	
+%define 	track_editor_ver	0.1.1
+%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.7
+Version:	0.3.8
 Release:	1
 License:	BSD
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/toycars/%{name}-%{version}.tar.gz
-# Source0-md5:	e8e7a868e2f2dcb2947ca8ffb860b36c
-Source1:	http://dl.sourceforge.net/toycars/%{name}_track_editor-%{editor_ver}.tar.gz
-# Source1-md5:	005cf7ebe50ad48e99075edc6e575d31
-Source2:	%{name}.desktop
+# Source0-md5:	0ed26f9e6e5086a40661d6b03127573e
+Source1:	http://dl.sourceforge.net/toycars/%{name}_track_editor-%{track_editor_ver}.tar.gz
+# Source1-md5:	1412bf0b95859aaa8d8a018c3efa5fbe
+Source2:	http://dl.sourceforge.net/toycars/%{name}_vehicle_editor-%{vehicle_editor_ver}.tar.gz
+# Source2-md5:	f443638a8d535b99b47316c6edca3efd
+Source3:	%{name}.desktop
 Patch0:		%{name}-headers.patch
 URL:		http://sourceforge.net/projects/toycars/
 BuildRequires:	OpenGL-GLU-devel
@@ -26,7 +29,7 @@
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
-%{?with_editor:BuildRequires:	fltk-gl-devel}
+%{?with_editors:BuildRequires:	fltk-gl-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,13 +44,13 @@
 Jupiter's Masterdrive na Atari ST.
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -a 2
 %patch0 -p1
 
-%if %{with editor}
+%if %{with editors}
 # copy the same file instead of patching it again
-cp src/Startline.cpp %{name}_track_editor-%{editor_ver}/src
-%{__perl} -pi -e 's at Fl/@FL/@' %{name}_track_editor-%{editor_ver}/src/TrackView.cxx
+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
 
 %build
@@ -58,8 +61,17 @@
 %configure
 %{__make}
 
-%if %{with editor}
-cd %{name}_track_editor-%{editor_ver}
+%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}
@@ -75,11 +87,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 install data/images/title.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
-%if %{with editor}
-	install %{name}_track_editor-%{editor_ver}/src/%{name}_track_editor $RPM_BUILD_ROOT%{_bindir}
+%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
@@ -99,6 +112,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/03/04 13:22:54  lisu
+- up to 0.3.8
+- track_editor up to 0.1.1
+- add vehicle_editor and make editors bcond provide for it
+
 Revision 1.10  2008/11/25 15:54:28  lisu
 - add track editor - it's separate project, but some files are the same
 - bcond for track editor (on by default)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/toycars.spec?r1=1.10&r2=1.11&f=u