[fgrun] define default settings for Fedora

[Fabrice Bellet]

commit ca6d53dfb7883abe73cc9e5b1b9187ce984b1f63
Author: Fabrice Bellet <fabrice at bellet.info>
Date:   Wed Mar 21 22:17:09 2012 +0100

    define default settings for Fedora
    
    - fix a crash when resetting default values
    - add a README.Fedora to quickly explain the initial setup
      with terrasync

 README.Fedora                                     |   17 +++++++++++++++++
 fgrun-1.6.1-default-settings-for-fedora.patch     |   16 ++++++++++++++++
 fgrun-1.6.1-fix-crash-when-setting-defaults.patch |   18 ++++++++++++++++++
 fgrun.spec                                        |   16 ++++++++++++++--
 4 files changed, 65 insertions(+), 2 deletions(-)
---
diff --git a/README.Fedora b/README.Fedora
new file mode 100644
index 0000000..1a6ac77
--- /dev/null
+++ b/README.Fedora
@@ -0,0 +1,17 @@
+To automatically download new scenery files, with terrasync:
+
+ - start fgrun
+ - click on "Prev"
+ - add a new FG_SCENERY directory where you have write access
+   (for example /home/user/.fgfs/Scenery)
+ - click on "Terrasync directory" so your newly created scenery
+   directory will be used by terrasync
+ - click on "Next", then select an aircraft
+ - click "Next" twice (skip the "Select a location" menu)
+ - activate "Terrasync" on its default port (5505)
+ - come back to the "Select a location" menu, click on "Scenery Prefetch"
+ - choose the four letter airport code of the place your want to start
+   from : http://en.wikipedia.org/wiki/List_of_airports_by_ICAO_code
+ - leave the "Log Window" in background
+ - click on "Refresh", the airports from the newly downloaded scenery
+   should be added to the global list
diff --git a/fgrun-1.6.1-default-settings-for-fedora.patch b/fgrun-1.6.1-default-settings-for-fedora.patch
new file mode 100644
index 0000000..fd2be74
--- /dev/null
+++ b/fgrun-1.6.1-default-settings-for-fedora.patch
@@ -0,0 +1,16 @@
+--- fgrun-1.6.1/src/main.cxx.orig	2012-03-21 21:40:36.505175844 +0100
++++ fgrun-1.6.1/src/main.cxx	2012-03-21 21:18:07.806477885 +0100
+@@ -37,10 +37,10 @@
+ #include "wizard.h"
+ #include "i18n.h"
+ 
+-std::string def_fg_exe = "";
+-std::string def_fg_root = "";
++std::string def_fg_exe = "/usr/bin/fgfs";
++std::string def_fg_root = "/usr/share/flightgear";
+ std::string def_fg_scenery = "";
+-std::string def_ts_exe = "";
++std::string def_ts_exe = "/usr/bin/terrasync";
+ int def_ts_dir = -1;
+ static bool silent = false;
+ static bool fullscreen = false;
diff --git a/fgrun-1.6.1-fix-crash-when-setting-defaults.patch b/fgrun-1.6.1-fix-crash-when-setting-defaults.patch
new file mode 100644
index 0000000..52b56d4
--- /dev/null
+++ b/fgrun-1.6.1-fix-crash-when-setting-defaults.patch
@@ -0,0 +1,18 @@
+--- fgrun-1.6.1/src/wizard_funcs.cxx.orig	2012-02-27 22:56:08.000000000 +0100
++++ fgrun-1.6.1/src/wizard_funcs.cxx	2012-03-21 21:00:52.072609457 +0100
+@@ -1200,7 +1200,6 @@ Wizard::~Wizard()
+     aircraft->clear();
+ 
+     delete logwin;
+-    delete win;
+     delete adv;
+ }
+ 
+@@ -2265,7 +2264,6 @@ Wizard::reset_settings()
+     prefs.set( "time_of_day_value", "noon" );
+ 
+     aircraft->value( 0 );
+-    preview->make_current();
+     preview->clear();
+     preview->redraw();
+ 
diff --git a/fgrun.spec b/fgrun.spec
index d994b5e..dba34d0 100644
--- a/fgrun.spec
+++ b/fgrun.spec
@@ -1,12 +1,13 @@
 Name:		fgrun
 Summary:	Graphical front-end for launching FlightGear flight simulator
 Version:	1.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+ and CC-BY-SA
 Group:		Amusements/Games
 URL:		http://sourceforge.net/projects/fgrun
 Source0:	http://sourceforge.net/projects/fgrun/files/fgrun/%{version}/fgrun-%{version}.tar.bz2
 Source1:	%{name}.desktop
+Source2:	README.Fedora
 # The icon is licensed under the CC Attribution-Share Alike 3.0 license
 # http://commons.wikimedia.org/wiki/File:Bt_plane.svg
 Source10:	http://upload.wikimedia.org/wikipedia/commons/9/9c/Bt_plane.svg
@@ -16,6 +17,8 @@ Source13:	Bt_plane-48.png
 Source14:	Bt_plane-64.png
 Source15:	Bt_plane-128.png
 Patch0:		fgrun-1.6.1-build-fgrun-with-static-ui-libs.patch
+Patch1:		fgrun-1.6.1-fix-crash-when-setting-defaults.patch
+Patch2:		fgrun-1.6.1-default-settings-for-fedora.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	FlightGear, opengl-games-utils, hicolor-icon-theme
 BuildRequires:	SimGear-devel >= 2.6.0
@@ -30,6 +33,9 @@ FlightGear flight simulator
 %prep 
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+cp -a %{SOURCE2} .
 
 %build 
 CXXFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -86,12 +92,18 @@ rm -fr %{buildroot}
 
 %files  -f %{name}.lang
 %defattr(-,root,root,-) 
-%doc COPYING NEWS AUTHORS README
+%doc COPYING NEWS AUTHORS README README.Fedora
 %{_bindir}/* 
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog 
+* Wed Mar 21 2012 Fabrice Bellet <fabrice at bellet.info> 1.6.1-2
+- define default settings for Fedora
+- fix a crash when resetting default values
+- add a README.Fedora to quickly explain the initial setup
+  with terrasync
+
 * Tue Feb 28 2012 Fabrice Bellet <fabrice at bellet.info> 1.6.1-1
 - new upstream release