[FlightGear-Atlas] rebuilt with newer SimGear
Fabrice Bellet
bellet at fedoraproject.org
Thu Feb 27 10:36:55 UTC 2014
commit 3ecb474e80013b54627fbadc21b31df125926b68
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Thu Feb 27 11:37:30 2014 +0100
rebuilt with newer SimGear
- temporary fix to use FlightGear-data-2.12 airports and navaids files
until upstream supports the new versions of these files as shipped in
FlightGear-data-3.0
.gitignore | 4 ++++
Atlas-fgdata-2.12.0-compat.patch | 36 ++++++++++++++++++++++++++++++++++++
FlightGear-Atlas.spec | 23 ++++++++++++++++++++++-
apt.dat.gz | Bin 0 -> 4962878 bytes
awy.dat.gz | Bin 0 -> 1740841 bytes
fix.dat.gz | Bin 0 -> 1326799 bytes
nav.dat.gz | Bin 0 -> 668582 bytes
sources | 4 ++++
8 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1a4fb5..d49f514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ Atlas-0.4.0-default-maps.tar.gz
/Atlas-0.4.9.cvs20120911.tar.bz2
/Atlas-0.4.9.cvs20130922.tar.bz2
/Atlas-0.4.9.cvs20131203.tar.bz2
+/apt.dat.gz
+/awy.dat.gz
+/fix.dat.gz
+/nav.dat.gz
diff --git a/Atlas-fgdata-2.12.0-compat.patch b/Atlas-fgdata-2.12.0-compat.patch
new file mode 100644
index 0000000..7866cde
--- /dev/null
+++ b/Atlas-fgdata-2.12.0-compat.patch
@@ -0,0 +1,36 @@
+diff -uNrp Atlas.orig/src/AtlasController.cxx Atlas/src/AtlasController.cxx
+--- Atlas.orig/src/AtlasController.cxx 2013-09-22 12:26:50.000000000 +0200
++++ Atlas/src/AtlasController.cxx 2014-02-26 21:35:50.592976961 +0100
+@@ -276,7 +276,7 @@ AtlasController::AtlasController(const c
+
+ // Load our navaid and airport data (and add strings to the
+ // Searcher object).
+- _navData = new NavData(p.fg_root.get().c_str(), _searcher);
++ _navData = new NavData(p.path.get().c_str(), _searcher);
+
+ // EYE - should this and the previous defaults be command-line
+ // options? Should we also initialize them by passing in the
+diff -uNrp Atlas.orig/src/AtlasWindow.cxx Atlas/src/AtlasWindow.cxx
+--- Atlas.orig/src/AtlasWindow.cxx 2013-09-22 12:26:51.000000000 +0200
++++ Atlas/src/AtlasWindow.cxx 2014-02-26 21:45:15.664578201 +0100
+@@ -2562,16 +2562,16 @@ HelpUI::HelpUI(int x, int y, AtlasWindow
+ globals.str.appendf("\n");
+ globals.str.appendf("Airports\n");
+ globals.str.appendf(" %s/Airports/apt.dat.gz\n",
+- p.fg_root.get().c_str());
++ p.path.get().c_str());
+ globals.str.appendf("Navaids\n");
+ globals.str.appendf(" %s/Navaids/nav.dat.gz\n",
+- p.fg_root.get().c_str());
++ p.path.get().c_str());
+ globals.str.appendf("Fixes\n");
+ globals.str.appendf(" %s/Navaids/fix.dat.gz\n",
+- p.fg_root.get().c_str());
++ p.path.get().c_str());
+ globals.str.appendf("Airways\n");
+ globals.str.appendf(" %s/Navaids/awy.dat.gz\n",
+- p.fg_root.get().c_str());
++ p.path.get().c_str());
+
+ globals.str.appendf("\nOpenGL\n");
+ globals.str.appendf(" vendor: %s\n", glGetString(GL_VENDOR));
diff --git a/FlightGear-Atlas.spec b/FlightGear-Atlas.spec
index 23b7499..b39d5ab 100644
--- a/FlightGear-Atlas.spec
+++ b/FlightGear-Atlas.spec
@@ -3,13 +3,20 @@
Name: FlightGear-Atlas
Summary: Flightgear map tools
Version: 0.4.9
-Release: 0.16%{snapshot}%{?dist}
+Release: 0.17%{snapshot}%{?dist}
License: GPLv2+
Group: Amusements/Games
Source0: Atlas-%{version}%{snapshot}.tar.bz2
Source1: Atlas-0.4.0-default-maps.tar.gz
+# temporary fix for fgdata 3.0.0 format change
+Source2: apt.dat.gz
+Source3: awy.dat.gz
+Source4: fix.dat.gz
+Source5: nav.dat.gz
URL: http://atlas.sourceforge.net
+# temporary fix for fgdata 3.0.0 format change
+Patch0: Atlas-fgdata-2.12.0-compat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freeglut-devel, curl-devel, libpng-devel, glew-devel
BuildRequires: SimGear-devel >= 2.6.0, OpenSceneGraph-devel
@@ -25,6 +32,8 @@ Atlas viewer
%prep
%setup -q -n Atlas
+# temporary fix for fgdata 3.0.0 format change
+%patch0 -p1
find -type f -name '*.[hc]xx' -exec chmod a-x {} \;
%build
@@ -40,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/flightgear
tar zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/flightgear
+# temporary fix for fgdata 3.0.0 format change
+install -d $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Airports
+install -d $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Navaids
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Airports
+cp -a %{SOURCE3} %{SOURCE4} %{SOURCE5} \
+ $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Navaids
# the palette file must be installed
install -d $RPM_BUILD_ROOT%{_datadir}/flightgear/Atlas/Palettes
@@ -64,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/flightgear/Atlas
%changelog
+* Fri Feb 21 2014 Fabrice Bellet <fabrice at bellet.info> - 0.4.9-0.17.cvs20131203
+- rebuilt with newer SimGear
+- temporary fix to use FlightGear-data-2.12 airports and navaids files
+ until upstream supports the new versions of these files as shipped in
+ FlightGear-data-3.0
+
* Wed Dec 11 2013 Fabrice Bellet <fabrice at bellet.info> - 0.4.9-0.16.cvs20131203
- new snapshot to gracefully handle scenery v2.0 generation from terrasync
diff --git a/apt.dat.gz b/apt.dat.gz
new file mode 100644
index 0000000..6c186f6
Binary files /dev/null and b/apt.dat.gz differ
diff --git a/awy.dat.gz b/awy.dat.gz
new file mode 100644
index 0000000..e6c9328
Binary files /dev/null and b/awy.dat.gz differ
diff --git a/fix.dat.gz b/fix.dat.gz
new file mode 100644
index 0000000..1ac3391
Binary files /dev/null and b/fix.dat.gz differ
diff --git a/nav.dat.gz b/nav.dat.gz
new file mode 100644
index 0000000..5aa3f53
Binary files /dev/null and b/nav.dat.gz differ
diff --git a/sources b/sources
index 3d989d3..0fd4f18 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,6 @@
dd709c9d43318ac71ac81dcaa00e02c6 Atlas-0.4.9.cvs20131203.tar.bz2
ad39040ecb18627f695d4a3c852db81b Atlas-0.4.0-default-maps.tar.gz
+9992d0f91c7e37afdbb97205c754cc3a apt.dat.gz
+f530c9d1c4b31a288ba88dcc8224268b awy.dat.gz
+982859a3e7b37b22b5bb285df897a118 fix.dat.gz
+71bc0b1625350176946df8d0a7ac10f8 nav.dat.gz
More information about the scm-commits
mailing list