[fgrun] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Thu Feb 27 10:29:33 UTC 2014
commit e73ed8c1ff896358147f217f1f89545cbfc83650
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Thu Feb 27 11:30:17 2014 +0100
new upstream release
.gitignore | 1 +
0001-Build-fgrun-with-static-ui-libs.patch | 10 ++++----
0002-Fix-a-crash-when-setting-defaults.patch | 12 +++++-----
0003-Default-settings-for-Fedora.patch | 15 +++++------
0004-Fix-reloadPath-logic.patch | 32 +++++--------------------
0005-Update-required-SimGear-version.patch | 25 --------------------
0006-Fix-for-gcc-format-security-flag.patch | 25 --------------------
fgrun.spec | 13 +++++-----
sources | 2 +-
9 files changed, 33 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb753bb..a77b649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/fgrun-1.6.1.tar.bz2
/fgrun-1.6.2.tar.bz2
/fgrun-1.7.0.tar.bz2
+/fgrun-3.0.0.tar.bz2
diff --git a/0001-Build-fgrun-with-static-ui-libs.patch b/0001-Build-fgrun-with-static-ui-libs.patch
index 8ed8206..65bee0d 100644
--- a/0001-Build-fgrun-with-static-ui-libs.patch
+++ b/0001-Build-fgrun-with-static-ui-libs.patch
@@ -1,17 +1,17 @@
-From 8929f60c84d46b499750c4c0045796ce6ed2ebbb Mon Sep 17 00:00:00 2001
+From c0ea7e49fae6bedd6e54eba52232c9ed5dd323b7 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 22 Sep 2013 12:50:32 +0200
-Subject: [PATCH 1/5] Build fgrun with static ui libs
+Subject: [PATCH 1/4] 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
+index 8d41452..9bfab24 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -16,10 +16,10 @@ if (MSVC)
+@@ -12,10 +12,10 @@ if (MSVC)
endif (MSVC)
FLTK_WRAP_UI(Wizard wizard.fl)
@@ -25,5 +25,5 @@ index 99dfdb8..a731b21 100644
set( ui_libs_1_3 Wizard Advanced )
--
-1.8.3.1
+1.8.5.3
diff --git a/0002-Fix-a-crash-when-setting-defaults.patch b/0002-Fix-a-crash-when-setting-defaults.patch
index be89a40..f337c22 100644
--- a/0002-Fix-a-crash-when-setting-defaults.patch
+++ b/0002-Fix-a-crash-when-setting-defaults.patch
@@ -1,17 +1,17 @@
-From e0efeca270bde19245cc557ca17527097d76e533 Mon Sep 17 00:00:00 2001
+From 481e6dbac8ccaf7a0111642ebb8dd7b135a6c0f7 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 22 Sep 2013 12:52:15 +0200
-Subject: [PATCH 2/5] Fix a crash when setting defaults
+Subject: [PATCH 2/4] 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
+index 32d5f55..3f82cfe 100644
--- a/src/wizard_funcs.cxx
+++ b/src/wizard_funcs.cxx
-@@ -1299,7 +1299,6 @@ Wizard::~Wizard()
+@@ -1265,7 +1265,6 @@ Wizard::~Wizard()
aircraft->clear();
delete logwin;
@@ -19,7 +19,7 @@ index 120f6da..23446d2 100644
delete adv;
}
-@@ -2383,7 +2382,6 @@ Wizard::reset_settings()
+@@ -2255,7 +2254,6 @@ Wizard::reset_settings()
prefs.set( "time_of_day_value", "noon" );
aircraft->value( 0 );
@@ -28,5 +28,5 @@ index 120f6da..23446d2 100644
preview->redraw();
--
-1.8.3.1
+1.8.5.3
diff --git a/0003-Default-settings-for-Fedora.patch b/0003-Default-settings-for-Fedora.patch
index 776d700..2fe47fe 100644
--- a/0003-Default-settings-for-Fedora.patch
+++ b/0003-Default-settings-for-Fedora.patch
@@ -1,17 +1,17 @@
-From 14f9883a8d054692c09f7c9b43dc1c2f54691886 Mon Sep 17 00:00:00 2001
+From 783e6e16c6ea77ede7d4fe9654d18620eba2efbd Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 22 Sep 2013 12:53:13 +0200
-Subject: [PATCH 3/5] Default settings for Fedora
+Subject: [PATCH 3/4] Default settings for Fedora
---
- fgrun.prefs | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ fgrun.prefs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fgrun.prefs b/fgrun.prefs
-index c52be0b..7abb907 100644
+index c52be0b..26d153f 100644
--- a/fgrun.prefs
+++ b/fgrun.prefs
-@@ -4,8 +4,9 @@
+@@ -4,8 +4,8 @@
[.]
@@ -21,9 +21,8 @@ index c52be0b..7abb907 100644
+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
+1.8.5.3
diff --git a/0004-Fix-reloadPath-logic.patch b/0004-Fix-reloadPath-logic.patch
index 1fe46f1..1f11dff 100644
--- a/0004-Fix-reloadPath-logic.patch
+++ b/0004-Fix-reloadPath-logic.patch
@@ -1,17 +1,17 @@
-From f84acb38f39cc5a98159a19ec2c3b67d64b0ce87 Mon Sep 17 00:00:00 2001
+From e10f0386658cb700aa8b647d975abc680c6a8299 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 22 Sep 2013 12:54:45 +0200
-Subject: [PATCH 4/5] Fix reloadPath logic
+Subject: [PATCH 4/4] Fix reloadPath logic
---
- src/wizard_funcs.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ src/wizard_funcs.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wizard_funcs.cxx b/src/wizard_funcs.cxx
-index 23446d2..59be533 100644
+index 3f82cfe..9a0d750 100644
--- a/src/wizard_funcs.cxx
+++ b/src/wizard_funcs.cxx
-@@ -299,7 +299,7 @@ Wizard::reset()
+@@ -307,7 +307,7 @@ Wizard::reset()
{
fg_scenery = buf;
}
@@ -20,24 +20,6 @@ index 23446d2..59be533 100644
{
fg_scenery = buf;
prefs.set("fg_scenery", buf);
-@@ -333,7 +333,7 @@ Wizard::reset()
- {
- ts_dir = iVal;
- }
-- else if (reloadPath && systemPrefs.get("ts_dir", iVal, 0))
-+ else if (systemPrefs.get("ts_dir", iVal, 0))
- {
- prefs.set("ts_dir", ts_dir);
- systemPrefs.get("ts_dir_init", iVal, 0);
-@@ -356,7 +356,7 @@ Wizard::reset()
- {
- ts_exe_->value(buf);
- }
-- else if (reloadPath && systemPrefs.get( "ts_exe", buf, "", buflen-1))
-+ else if (systemPrefs.get( "ts_exe", buf, "", buflen-1))
- {
- ts_exe_->value( buf );
- prefs.set("ts_exe", buf);
--
-1.8.3.1
+1.8.5.3
diff --git a/fgrun.spec b/fgrun.spec
index 772ea04..37ce0fa 100644
--- a/fgrun.spec
+++ b/fgrun.spec
@@ -1,12 +1,12 @@
Name: fgrun
Summary: Graphical front-end for launching FlightGear flight simulator
-Version: 1.7.0
-Release: 2%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
License: GPLv2+ and CC-BY-SA
Group: Amusements/Games
URL: http://sourceforge.net/projects/fgrun
# 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
+# git archive --format=tar.bz2 -o fgrun-3.0.0.tar.bz2 --prefix=fgrun-3.0.0/ origin/release/3.0.0
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: README.Fedora
@@ -22,8 +22,6 @@ 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
-Patch6: 0006-Fix-for-gcc-format-security-flag.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: FlightGear, opengl-games-utils, hicolor-icon-theme
BuildRequires: SimGear-devel >= 2.6.0
@@ -42,8 +40,6 @@ FlightGear flight simulator
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
cp -a %{SOURCE2} .
%build
@@ -113,6 +109,9 @@ rm -fr %{buildroot}
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Fri Feb 21 2014 Fabrice Bellet <fabrice at bellet.info> - 3.0.0-1
+- new upstream release
+
* Wed Dec 11 2013 Fabrice Bellet <fabrice at bellet.info> - 1.7.0-2
- Prevent build failure with -Werror=format-security (bug #1037061).
diff --git a/sources b/sources
index b00fadb..5898c1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef6169a2da4a7cd53fa5147b5ef846dd fgrun-1.7.0.tar.bz2
+96e735dfe590f0c7f0e23b3c4af70421 fgrun-3.0.0.tar.bz2
More information about the scm-commits
mailing list