commit 477525491a94104b8ecfb24cf769c512ba96191c
Author: Fabrice Bellet <fabrice(a)bellet.info>
Date: Mon Sep 30 18:44:20 2013 +0200
new upstream release
.gitignore | 1 +
0001-Build-fgrun-with-static-ui-libs.patch | 29 ++++++++++++++++++
0002-Fix-a-crash-when-setting-defaults.patch | 32 ++++++++++++++++++++
0003-Default-settings-for-Fedora.patch | 29 ++++++++++++++++++
...-logic.patch => 0004-Fix-reloadPath-logic.patch | 24 ++++++++++++---
0005-Update-required-SimGear-version.patch | 25 +++++++++++++++
fgrun-1.6.1-build-fgrun-with-static-ui-libs.patch | 16 ----------
fgrun-1.6.1-fix-crash-when-setting-defaults.patch | 18 -----------
fgrun-1.6.2-default-settings-for-fedora.patch | 15 ---------
fgrun-1.6.2-update-required-simgear-version.patch | 12 -------
fgrun.spec | 23 ++++++++-----
sources | 2 +-
12 files changed, 150 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 720cd90..fb753bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/fgrun-1.6.0.svn20110905.tar.gz
/fgrun-1.6.1.tar.bz2
/fgrun-1.6.2.tar.bz2
+/fgrun-1.7.0.tar.bz2
diff --git a/0001-Build-fgrun-with-static-ui-libs.patch
b/0001-Build-fgrun-with-static-ui-libs.patch
new file mode 100644
index 0000000..8ed8206
--- /dev/null
+++ b/0001-Build-fgrun-with-static-ui-libs.patch
@@ -0,0 +1,29 @@
+From 8929f60c84d46b499750c4c0045796ce6ed2ebbb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:50:32 +0200
+Subject: [PATCH 1/5] Build fgrun with static ui libs
+
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 99dfdb8..a731b21 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -16,10 +16,10 @@ if (MSVC)
+ endif (MSVC)
+
+ FLTK_WRAP_UI(Wizard wizard.fl)
+-add_library(Wizard ${Wizard_FLTK_UI_SRCS})
++add_library(Wizard STATIC ${Wizard_FLTK_UI_SRCS})
+
+ FLTK_WRAP_UI(Advanced advanced.fl)
+-add_library(Advanced ${Advanced_FLTK_UI_SRCS})
++add_library(Advanced STATIC ${Advanced_FLTK_UI_SRCS})
+
+ set( ui_libs_1_3 Wizard Advanced )
+
+--
+1.8.3.1
+
diff --git a/0002-Fix-a-crash-when-setting-defaults.patch
b/0002-Fix-a-crash-when-setting-defaults.patch
new file mode 100644
index 0000000..be89a40
--- /dev/null
+++ b/0002-Fix-a-crash-when-setting-defaults.patch
@@ -0,0 +1,32 @@
+From e0efeca270bde19245cc557ca17527097d76e533 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:52:15 +0200
+Subject: [PATCH 2/5] Fix a crash when setting defaults
+
+---
+ src/wizard_funcs.cxx | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/wizard_funcs.cxx b/src/wizard_funcs.cxx
+index 120f6da..23446d2 100644
+--- a/src/wizard_funcs.cxx
++++ b/src/wizard_funcs.cxx
+@@ -1299,7 +1299,6 @@ Wizard::~Wizard()
+ aircraft->clear();
+
+ delete logwin;
+- delete win;
+ delete adv;
+ }
+
+@@ -2383,7 +2382,6 @@ Wizard::reset_settings()
+ prefs.set( "time_of_day_value", "noon" );
+
+ aircraft->value( 0 );
+- preview->make_current();
+ preview->clear();
+ preview->redraw();
+
+--
+1.8.3.1
+
diff --git a/0003-Default-settings-for-Fedora.patch
b/0003-Default-settings-for-Fedora.patch
new file mode 100644
index 0000000..776d700
--- /dev/null
+++ b/0003-Default-settings-for-Fedora.patch
@@ -0,0 +1,29 @@
+From 14f9883a8d054692c09f7c9b43dc1c2f54691886 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:53:13 +0200
+Subject: [PATCH 3/5] Default settings for Fedora
+
+---
+ fgrun.prefs | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/fgrun.prefs b/fgrun.prefs
+index c52be0b..7abb907 100644
+--- a/fgrun.prefs
++++ b/fgrun.prefs
+@@ -4,8 +4,9 @@
+
+ [.]
+
+-fg_exe:/usr/local/bin/fgfs
+-fg_root:/usr/local/lib/FlightGear/data
+-fg_scenery:/usr/local/lib/FlightGear/data/Scenery
++fg_exe:/usr/bin/fgfs
++fg_root:/usr/share/flightgear
++fg_scenery:/usr/share/flightgear/Scenery
++ts_exe:/usr/bin/terrasync
+ aircraft:c172-3d
+ airport:KSFO
+--
+1.8.3.1
+
diff --git a/fgrun-1.6.2-fix-reloadpath-logic.patch b/0004-Fix-reloadPath-logic.patch
similarity index 58%
rename from fgrun-1.6.2-fix-reloadpath-logic.patch
rename to 0004-Fix-reloadPath-logic.patch
index 0fb9006..1fe46f1 100644
--- a/fgrun-1.6.2-fix-reloadpath-logic.patch
+++ b/0004-Fix-reloadPath-logic.patch
@@ -1,6 +1,17 @@
---- fgrun-1.6.2/src/wizard_funcs.cxx.orig 2012-09-11 14:57:53.176639212 +0200
-+++ fgrun-1.6.2/src/wizard_funcs.cxx 2012-09-11 15:11:35.995000085 +0200
-@@ -296,7 +296,7 @@
+From f84acb38f39cc5a98159a19ec2c3b67d64b0ce87 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:54:45 +0200
+Subject: [PATCH 4/5] Fix reloadPath logic
+
+---
+ src/wizard_funcs.cxx | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/wizard_funcs.cxx b/src/wizard_funcs.cxx
+index 23446d2..59be533 100644
+--- a/src/wizard_funcs.cxx
++++ b/src/wizard_funcs.cxx
+@@ -299,7 +299,7 @@ Wizard::reset()
{
fg_scenery = buf;
}
@@ -9,7 +20,7 @@
{
fg_scenery = buf;
prefs.set("fg_scenery", buf);
-@@ -338,7 +338,7 @@
+@@ -333,7 +333,7 @@ Wizard::reset()
{
ts_dir = iVal;
}
@@ -18,7 +29,7 @@
{
prefs.set("ts_dir", ts_dir);
systemPrefs.get("ts_dir_init", iVal, 0);
-@@ -353,7 +353,7 @@
+@@ -356,7 +356,7 @@ Wizard::reset()
{
ts_exe_->value(buf);
}
@@ -27,3 +38,6 @@
{
ts_exe_->value( buf );
prefs.set("ts_exe", buf);
+--
+1.8.3.1
+
diff --git a/0005-Update-required-SimGear-version.patch
b/0005-Update-required-SimGear-version.patch
new file mode 100644
index 0000000..9f37d95
--- /dev/null
+++ b/0005-Update-required-SimGear-version.patch
@@ -0,0 +1,25 @@
+From 436f659bdcef3726ece7928e221ba7ea7805381e Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice(a)bellet.info>
+Date: Sun, 22 Sep 2013 12:55:33 +0200
+Subject: [PATCH 5/5] Update required SimGear version
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa95c59..4b6fea5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@ find_package(Boost REQUIRED)
+ find_package(ZLIB REQUIRED)
+ find_package(FLTK REQUIRED)
+ find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgDB osgParticle osgUtil osgViewer
osgGA)
+-find_package(SimGear 2.8.0 REQUIRED)
++find_package(SimGear 2.12.0 REQUIRED)
+ if (ENABLE_NLS)
+ find_package(Gettext)
+ endif (ENABLE_NLS)
+--
+1.8.3.1
+
diff --git a/fgrun.spec b/fgrun.spec
index b6882a1..2900bd5 100644
--- a/fgrun.spec
+++ b/fgrun.spec
@@ -1,11 +1,13 @@
Name: fgrun
Summary: Graphical front-end for launching FlightGear flight simulator
-Version: 1.6.2
-Release: 8%{?dist}
+Version: 1.7.0
+Release: 1%{?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-%{vers...
+# git clone
git://gitorious.org/fg/fgrun.git
+# git archive --format=tar.bz2 -o fgrun-1.7.0.tar.bz2 --prefix=fgrun-1.7.0/
origin/release/1.7.0
+Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: README.Fedora
# The icon is licensed under the CC Attribution-Share Alike 3.0 license
@@ -16,11 +18,11 @@ Source12: Bt_plane-32.png
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.2-default-settings-for-fedora.patch
-Patch3: fgrun-1.6.2-fix-reloadpath-logic.patch
-Patch4: fgrun-1.6.2-update-required-simgear-version.patch
+Patch1: 0001-Build-fgrun-with-static-ui-libs.patch
+Patch2: 0002-Fix-a-crash-when-setting-defaults.patch
+Patch3: 0003-Default-settings-for-Fedora.patch
+Patch4: 0004-Fix-reloadPath-logic.patch
+Patch5: 0005-Update-required-SimGear-version.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: FlightGear, opengl-games-utils, hicolor-icon-theme
BuildRequires: SimGear-devel >= 2.6.0
@@ -35,11 +37,11 @@ FlightGear flight simulator
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cp -a %{SOURCE2} .
%build
@@ -109,6 +111,9 @@ rm -fr %{buildroot}
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Sun Sep 22 2013 Fabrice Bellet <fabrice(a)bellet.info> - 1.7.0-1
+- new upstream release
+
* Thu Aug 15 2013 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.6.2-8
- Rebuilt for OSG-3.2.0.
diff --git a/sources b/sources
index ae87bbc..b00fadb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-683c0f97be2163e85a518ee706d92177 fgrun-1.6.2.tar.bz2
+ef6169a2da4a7cd53fa5147b5ef846dd fgrun-1.7.0.tar.bz2