rpms/TnL/F-7 TnL-070909-crash-on-exit.patch, NONE, 1.1 TnL-070909-system-boost.patch, NONE, 1.1 TnL.desktop, NONE, 1.1 TnL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Oct 4 10:13:44 UTC 2007

Author: jwrdegoede

Update of /cvs/extras/rpms/TnL/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12952

Modified Files:
	.cvsignore sources 
Added Files:
	TnL-070909-crash-on-exit.patch TnL-070909-system-boost.patch 
	TnL.desktop TnL.spec 
Log Message:
* Wed Oct  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 070909-2
- Use %{name} everywhere for consistency
- Add missing boost-devel BuildRequires
- Exit gracefully when the game cannot open the soundcard
- Use opengl-games-utils wrapper to show error dialog when DRI is missing


TnL-070909-crash-on-exit.patch:

--- NEW FILE TnL-070909-crash-on-exit.patch ---
diff -up TnL-source-070909/src/game.cc~ TnL-source-070909/src/game.cc
--- TnL-source-070909/src/game.cc~	2007-10-03 16:42:57.000000000 +0200
+++ TnL-source-070909/src/game.cc	2007-10-03 16:42:57.000000000 +0200
@@ -329,6 +329,9 @@ Game::~Game()
     ls_message("Exiting SDL.\n");
     SDL_Quit();
     ls_message("Exiting game.\n");
+    /* ugly but necessary, because otherwise Ptr<> will call unref on us after
+       destruction in the case the constructor failed */
+    exit(1);
 }
 
 void Game::run()

TnL-070909-system-boost.patch:

--- NEW FILE TnL-070909-system-boost.patch ---
diff -up TnL-source-070909/configure.in~ TnL-source-070909/configure.in
--- TnL-source-070909/configure.in~	2007-09-13 21:45:55.000000000 +0200
+++ TnL-source-070909/configure.in	2007-09-13 21:45:55.000000000 +0200
@@ -157,7 +157,6 @@ AC_CONFIG_FILES([
 Makefile
 scripts/Makefile
 src/Makefile
-src/boost/Makefile
 src/interfaces/Makefile
 src/modules/Makefile
 src/modules/LoDTerrain/Makefile
diff -up TnL-source-070909/configure~ TnL-source-070909/configure
--- TnL-source-070909/configure~	2007-09-13 21:45:49.000000000 +0200
+++ TnL-source-070909/configure	2007-09-13 21:45:49.000000000 +0200
@@ -5653,7 +5653,7 @@ done
 
 
 
-ac_config_files="$ac_config_files Makefile scripts/Makefile src/Makefile src/boost/Makefile src/interfaces/Makefile src/modules/Makefile src/modules/LoDTerrain/Makefile src/modules/actors/Makefile src/modules/actors/carrier/Makefile src/modules/actors/drone/Makefile src/modules/actors/fx/Makefile src/modules/actors/projectiles/Makefile src/modules/actors/tank/Makefile src/modules/ai/Makefile src/modules/camera/Makefile src/modules/clock/Makefile src/modules/collide/Makefile src/modules/config/Makefile src/modules/drawing/Makefile src/modules/engines/Makefile src/modules/environment/Makefile src/modules/flight/Makefile src/modules/fontman/Makefile src/modules/gunsight/Makefile src/modules/jogi/Makefile src/modules/math/Makefile src/modules/model/Makefile src/modules/physics/Makefile src/modules/scripting/Makefile src/modules/skybox/Makefile src/modules/texman/Makefile src/modules/ui/Makefile src/modules/weaponsys/Makefile"
+ac_config_files="$ac_config_files Makefile scripts/Makefile src/Makefile src/interfaces/Makefile src/modules/Makefile src/modules/LoDTerrain/Makefile src/modules/actors/Makefile src/modules/actors/carrier/Makefile src/modules/actors/drone/Makefile src/modules/actors/fx/Makefile src/modules/actors/projectiles/Makefile src/modules/actors/tank/Makefile src/modules/ai/Makefile src/modules/camera/Makefile src/modules/clock/Makefile src/modules/collide/Makefile src/modules/config/Makefile src/modules/drawing/Makefile src/modules/engines/Makefile src/modules/environment/Makefile src/modules/flight/Makefile src/modules/fontman/Makefile src/modules/gunsight/Makefile src/modules/jogi/Makefile src/modules/math/Makefile src/modules/model/Makefile src/modules/physics/Makefile src/modules/scripting/Makefile src/modules/skybox/Makefile src/modules/texman/Makefile src/modules/ui/Makefile src/modules/weaponsys/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6243,7 +6243,6 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/boost/Makefile") CONFIG_FILES="$CONFIG_FILES src/boost/Makefile" ;;
     "src/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES src/interfaces/Makefile" ;;
     "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
     "src/modules/LoDTerrain/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/LoDTerrain/Makefile" ;;
diff -up TnL-source-070909/src/Makefile.in~ TnL-source-070909/src/Makefile.in
--- TnL-source-070909/src/Makefile.in~	2007-09-14 07:08:48.000000000 +0200
+++ TnL-source-070909/src/Makefile.in	2007-09-14 07:08:48.000000000 +0200
@@ -211,7 +211,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = modules boost interfaces
+SUBDIRS = modules interfaces
 tnl_bin_SOURCES = game.cc game.h tnl.h \
                         Factory.h \
                         initControls.cc \
diff -up TnL-source-070909/src/Makefile.am~ TnL-source-070909/src/Makefile.am
--- TnL-source-070909/src/Makefile.am~	2007-09-14 07:08:29.000000000 +0200
+++ TnL-source-070909/src/Makefile.am	2007-09-14 07:08:29.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = modules boost interfaces
+SUBDIRS = modules interfaces
 
 bin_PROGRAMS = tnl-bin
 


--- NEW FILE TnL.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Thunder and Lightning
Comment=Thunder and Lightning - a futuristic action flight simulator game
Comment[de]=Thunder and Lightning - ein futuristischer Flugsimulator
Exec=TnL-wrapper
Icon=tnlgame
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;Simulation;


--- NEW FILE TnL.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses

Name:           TnL
Version:        070909
Release:        2%{?dist}
Summary:        Thunder & Lightning - A futuristic action flight simulator game
Group:          Amusements/Games
License:        GPL+
URL:            http://tnlgame.net
Source0:        http://tnlgame.net/downloads/tnl/%{version}/%{name}-source-%{version}.tar.bz2
Source1:        %{name}.desktop
Patch0:         TnL-070909-system-boost.patch
Patch1:         TnL-070909-crash-on-exit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  freealut-devel glew-devel libpng-devel libsigc++-devel
BuildRequires:  SDL-devel Io-language-devel boost-devel desktop-file-utils
Requires:       %{name}-data = %{version}, opengl-games-utils

%description
Thunder&Lightning is a futuristic action flight simulator game
that takes place in a large 3D environment. Jump into the pilot
seat of your Lightning aircraft and fight against Thunder tanks
in a fierce battle for control of the island!

In the long run, Thunder&Lightning will incorporate features from
the 80's classics Carrier Command and Midwinter. There will be
multiple Islands to conquer, each with its own defense strategy.

Thunder&Lightning will not be mission oriented, but there will be
scripted events for each island.


%prep
%setup -q -n %{name}-source-%{version}
%patch0 -p1
%patch1 -p1
# we want to use the system version of boost
rm -r src/boost
# stop autoxxx from rerunning because of our patches above
touch aclocal.m4
touch configure config.h.in `find -name Makefile.in`


%build
%configure --with-io-cflags=-I/usr/include/io --with-io-libs=-liovmall \
   --enable-release
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
# tnl installs a useless and ugly wrapper, all we need is the binary, so DIY
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 src/tnl-bin $RPM_BUILD_ROOT%{_bindir}/%{name}
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/%{name}*
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Wed Oct  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 070909-2
- Use %{name} everywhere for consistency
- Add missing boost-devel BuildRequires
- Exit gracefully when the game cannot open the soundcard
- Use opengl-games-utils wrapper to show error dialog when DRI is missing

* Thu Sep 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 070909-1
- Adapted Packman spec file for Fedora

* Mon Aug 27 2007 Toni Graffy <toni at links2linux.de> 20070827-0.pm.1
- update to 20070827
- added fontoplus, glf2jft and texgen2 to tools

* Tue Jul 10 2007 Toni Graffy <toni at links2linux.de> 20070710-0.pm.1
- update to 20070710
- added TnL-tools

* Sun May 27 2007 Toni Graffy <toni at links2linux.de> 20070527-0.pm.2
- initial package 20070526


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TnL/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Oct 2007 02:40:25 -0000	1.1
+++ .cvsignore	4 Oct 2007 10:13:12 -0000	1.2
@@ -0,0 +1 @@
+TnL-source-070909.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TnL/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Oct 2007 02:40:25 -0000	1.1
+++ sources	4 Oct 2007 10:13:12 -0000	1.2
@@ -0,0 +1 @@
+0ae15392635eee0bd385d08cba9b4a3d  TnL-source-070909.tar.bz2


