[FlightGear] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Wed Mar 11 12:34:02 UTC 2015
commit dbe94234c56d006f3357b16136d094f558f4a2e5
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Wed Mar 11 13:33:39 2015 +0100
new upstream release
- enable Qt Launcher
.gitignore | 1 +
...-sure-that-n-is-not-being-set-as-format-t.patch | 4 +-
...ke-ShivaVG-and-FGAdminUI-static-libraries.patch | 4 +-
...e-system-iaxclient-instead-of-bundled-one.patch | 52 +++++++++++++---------
0005-explicitely-link-with-libX11.patch | 36 +++++++++++++++
0006-make-fglauncher-a-static-library.patch | 25 +++++++++++
FlightGear.spec | 15 +++++--
sources | 2 +-
8 files changed, 110 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e9a1f3..78d8e8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ FlightGear-2.0.0.tar.gz
/flightgear-2.12.0.tar.bz2
/flightgear-3.0.0.tar.bz2
/flightgear-3.2.0.tar.bz2
+/flightgear-3.4.0.tar.bz2
diff --git a/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
index 7e6bc20..cc9e8a0 100644
--- a/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
+++ b/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -1,4 +1,4 @@
-From f315a72f129d3baaa616ac3936a6e6bf13fcaffb Mon Sep 17 00:00:00 2001
+From c6083b97dc69c0995c6a63ecb7fe25900a8a2380 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 22 Sep 2013 12:19:18 +0200
Subject: [PATCH] check to be sure that %n is not being set as format type
@@ -29,5 +29,5 @@ index 58653e0..c44e7ee 100644
do {
variety++;
--
-1.9.3
+2.1.0
diff --git a/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch b/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
index f020e76..2847948 100644
--- a/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
+++ b/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
@@ -1,4 +1,4 @@
-From 2e8ac7b5e09cd821b50e0c1745a15edbcaba2bc8 Mon Sep 17 00:00:00 2001
+From 2acddd6efcdc8b20b94e5d76bf7964ea51fc664f Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
Date: Sun, 22 Sep 2013 12:21:23 +0200
Subject: [PATCH] make ShivaVG and FGAdminUI static libraries
@@ -19,5 +19,5 @@ index ef98c6c..275f4c6 100644
add_executable(fgadmin WIN32 fgadmin_funcs.cxx main.cxx untarka.c)
add_dependencies(fgadmin FGAdminUI)
--
-1.9.3
+2.1.0
diff --git a/0003-Use-system-iaxclient-instead-of-bundled-one.patch b/0003-Use-system-iaxclient-instead-of-bundled-one.patch
index 5687adc..e43c98d 100644
--- a/0003-Use-system-iaxclient-instead-of-bundled-one.patch
+++ b/0003-Use-system-iaxclient-instead-of-bundled-one.patch
@@ -1,6 +1,6 @@
-From 899cd9a2d821137c545560880f63d99c0f6538d8 Mon Sep 17 00:00:00 2001
+From 34de84b35bc721ce3e3728789e97b4b295c1c01f Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice at bellet.info>
-Date: Fri, 12 Sep 2014 17:15:55 +0200
+Date: Tue, 17 Feb 2015 20:14:04 +0100
Subject: [PATCH] Use system iaxclient instead of bundled one
---
@@ -8,8 +8,9 @@ Subject: [PATCH] Use system iaxclient instead of bundled one
CMakeLists.txt | 1 -
src/Main/CMakeLists.txt | 2 +-
src/Network/fgcom.cxx | 2 +-
- utils/fgcom/CMakeLists.txt | 4 +---
- 5 files changed, 3 insertions(+), 10 deletions(-)
+ utils/fgcom/CMakeLists.txt | 2 +-
+ utils/fgcom/fgcom.cxx | 2 +-
+ 6 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index ec9822c..a385193 100644
@@ -27,10 +28,10 @@ index ec9822c..a385193 100644
add_subdirectory(cjson)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1824861..bcb802d 100644
+index a902ea8..bbe0e47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -186,7 +186,6 @@ endif()
+@@ -192,7 +192,6 @@ endif()
if(ENABLE_FGCOM)
set(ENABLE_IAX 1)
@@ -39,7 +40,7 @@ index 1824861..bcb802d 100644
# Setup MSVC 3rd party directories
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
-index f799ae6..487f053 100644
+index 949b379..12c0961 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -117,7 +117,7 @@ if(ENABLE_JSBSIM)
@@ -65,20 +66,31 @@ index 8d1bfc9..b501bd7 100644
#define NUM_CALLS 4
diff --git a/utils/fgcom/CMakeLists.txt b/utils/fgcom/CMakeLists.txt
-index 2629d89..f3a4530 100644
+index bfa43e3..b764cca 100644
--- a/utils/fgcom/CMakeLists.txt
+++ b/utils/fgcom/CMakeLists.txt
-@@ -39,9 +39,7 @@
- if(WIN32)
- set_target_properties( ${name} PROPERTIES DEBUG_POSTFIX d )
- endif()
-- target_link_libraries( ${name} iaxclient_lib )
-- # this could be just on a target basis, but for now
-- include_directories( ${CMAKE_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
-+ target_link_libraries( ${name} iaxclient )
- # Now include simgear libraries
- target_link_Libraries( ${name}
- ${OPENAL_LIBRARY}
+@@ -25,7 +25,7 @@ add_executable(${name}
+ )
+
+ target_link_Libraries(${name}
+- iaxclient_lib
++ iaxclient
+ ${OPENAL_LIBRARY}
+ ${SIMGEAR_CORE_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+diff --git a/utils/fgcom/fgcom.cxx b/utils/fgcom/fgcom.cxx
+index 35351b7..2266d77 100644
+--- a/utils/fgcom/fgcom.cxx
++++ b/utils/fgcom/fgcom.cxx
+@@ -36,7 +36,7 @@
+ #include <simgear/debug/logstream.hxx>
+ #include <simgear/timing/timestamp.hxx>
+
+-#include <3rdparty/iaxclient/lib/iaxclient.h>
++#include <iaxclient.h>
+
+ #include "fgcom.hxx"
+ #include "positions.hxx" // provides _positionsData[];
--
-1.9.3
+2.1.0
diff --git a/0005-explicitely-link-with-libX11.patch b/0005-explicitely-link-with-libX11.patch
new file mode 100644
index 0000000..97a16e4
--- /dev/null
+++ b/0005-explicitely-link-with-libX11.patch
@@ -0,0 +1,36 @@
+From 04ca64edc46cfb54ecff5bddf12370b2c7a0f192 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Tue, 17 Feb 2015 22:49:50 +0100
+Subject: [PATCH] explicitely link with libX11
+
+---
+ src/Main/CMakeLists.txt | 1 +
+ utils/fgviewer/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
+index 12c0961..78c4163 100644
+--- a/src/Main/CMakeLists.txt
++++ b/src/Main/CMakeLists.txt
+@@ -142,6 +142,7 @@ target_link_libraries(fgfs
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+ ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
+ ${PLATFORM_LIBS}
++ ${X11_X11_LIB}
+ )
+
+ if(ENABLE_FLITE)
+diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
+index 165be74..065b8f1 100644
+--- a/utils/fgviewer/CMakeLists.txt
++++ b/utils/fgviewer/CMakeLists.txt
+@@ -48,5 +48,6 @@ target_link_libraries(fgviewer
+ ${OPENGL_LIBRARIES}
+ ${FGVIEWER_RTI_LIBRARIES}
+ ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
++ ${X11_X11_LIB}
+ )
+ install(TARGETS fgviewer RUNTIME DESTINATION bin)
+--
+2.1.0
+
diff --git a/0006-make-fglauncher-a-static-library.patch b/0006-make-fglauncher-a-static-library.patch
new file mode 100644
index 0000000..1351e7d
--- /dev/null
+++ b/0006-make-fglauncher-a-static-library.patch
@@ -0,0 +1,25 @@
+From 0df708f91f9b686fcd5e0bd3fa88f3677deb3304 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Tue, 17 Feb 2015 23:00:29 +0100
+Subject: [PATCH] make fglauncher a static library
+
+---
+ src/GUI/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
+index 37c2af6..d814372 100644
+--- a/src/GUI/CMakeLists.txt
++++ b/src/GUI/CMakeLists.txt
+@@ -75,7 +75,7 @@ if (HAVE_QT)
+
+ include_directories(${PROJECT_BINARY_DIR}/src/GUI)
+
+- add_library(fglauncher QtLauncher.cxx
++ add_library(fglauncher STATIC QtLauncher.cxx
+ QtLauncher.hxx
+ AirportDiagram.cxx
+ AirportDiagram.hxx
+--
+2.1.0
+
diff --git a/FlightGear.spec b/FlightGear.spec
index 523d593..89b893f 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,7 +1,7 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 3.2.0
-Release: 3%{?dist}
+Version: 3.4.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
Source0: http://mirrors.ibiblio.org/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
@@ -17,6 +17,8 @@ Source7: COPYING
Patch1: 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
Patch2: 0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
Patch3: 0003-Use-system-iaxclient-instead-of-bundled-one.patch
+Patch5: 0005-explicitely-link-with-libX11.patch
+Patch6: 0006-make-fglauncher-a-static-library.patch
URL: http://www.flightgear.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +27,7 @@ BuildRequires: libpng-devel, freeglut-devel, libXi-devel, libXmu-devel
BuildRequires: OpenSceneGraph-devel >= 3.0.0, boost-devel >= 1.44.0
BuildRequires: fltk-fluid, fltk-devel, dbus-devel, sqlite-devel
BuildRequires: cmake, desktop-file-utils, iaxclient-devel
-BuildRequires: bzip2-devel, systemd-devel
+BuildRequires: bzip2-devel, systemd-devel, qt5-qtbase-devel
Requires: FlightGear-data >= %{version}, opengl-games-utils
Requires: hicolor-icon-theme
@@ -40,6 +42,8 @@ expanded and improved upon by anyone interested in contributing
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch5 -p1
+%patch6 -p1
rm -rf 3rdparty/iaxclient
# make rpmlint happy
@@ -120,9 +124,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/flightgear/*
%changelog
+* Wed Mar 11 2015 Fabrice Bellet <fabrice at bellet.info> - 3.4.0-1
+- new upstream release
+- enable Qt Launcher
+
* Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 3.2.0-3
- rebuild (fltk)
diff --git a/sources b/sources
index ba0ecba..6600967 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a16920cc22ea070f8bb345e76c55e05 flightgear-3.2.0.tar.bz2
+0a6f4c27baf64f3e7d58fd44612118df flightgear-3.4.0.tar.bz2
More information about the scm-commits
mailing list