From 6232c02154a7781fac9c830348dc1f181fa4eebe Mon Sep 17 00:00:00 2001 From: Fabrice Bellet Date: Nov 25 2016 14:36:53 +0000 Subject: new upstream release --- diff --git a/.gitignore b/.gitignore index a3528d9..9764bdf 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ FlightGear-2.0.0.tar.gz /flightgear-2016.1.2.tar.bz2 /flightgear-2016.2.1.tar.bz2 /flightgear-2016.3.1.tar.bz2 +/flightgear-2016.4.1.tar.bz2 +/flightgear-2016.4.2.tar.bz2 diff --git a/0002-Use-system-iaxclient-instead-of-bundled-one.patch b/0002-Use-system-iaxclient-instead-of-bundled-one.patch index 5432b59..cd62957 100644 --- a/0002-Use-system-iaxclient-instead-of-bundled-one.patch +++ b/0002-Use-system-iaxclient-instead-of-bundled-one.patch @@ -1,4 +1,4 @@ -From 53bb2102dc19c008eacbb5c92bf279ad29f70a55 Mon Sep 17 00:00:00 2001 +From 29a7e8b521d37bad785dcbc9fa80ff80acc1f716 Mon Sep 17 00:00:00 2001 From: Fabrice Bellet Date: Tue, 17 Feb 2015 20:14:04 +0100 Subject: [PATCH] Use system iaxclient instead of bundled one @@ -28,10 +28,10 @@ index ec9822c..a385193 100644 add_subdirectory(cjson) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 50d2c10..6e651e7 100644 +index 00df2a8..324f9ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -210,7 +210,6 @@ endif() +@@ -203,7 +203,6 @@ endif() if(ENABLE_FGCOM) set(ENABLE_IAX 1) @@ -40,7 +40,7 @@ index 50d2c10..6e651e7 100644 # Setup MSVC 3rd party directories diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt -index 4ea0fe5..0a43c7a 100644 +index 492b6b9..195766f 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -117,7 +117,7 @@ if(ENABLE_JSBSIM) @@ -66,18 +66,18 @@ index 8d1bfc9..b501bd7 100644 #define NUM_CALLS 4 diff --git a/utils/fgcom/CMakeLists.txt b/utils/fgcom/CMakeLists.txt -index bfa43e3..b764cca 100644 +index 273c2d2..7d36f28 100644 --- a/utils/fgcom/CMakeLists.txt +++ b/utils/fgcom/CMakeLists.txt -@@ -25,7 +25,7 @@ add_executable(${name} +@@ -27,7 +27,7 @@ add_executable(${name} ) target_link_Libraries(${name} - iaxclient_lib + iaxclient ${OPENAL_LIBRARY} - ${SIMGEAR_CORE_LIBRARIES} - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} + SimGearCore + ) diff --git a/utils/fgcom/fgcom.cxx b/utils/fgcom/fgcom.cxx index 0a8f46d..22fda47 100644 --- a/utils/fgcom/fgcom.cxx @@ -92,5 +92,5 @@ index 0a8f46d..22fda47 100644 #include "fgcom.hxx" #include "positions.hxx" // provides _positionsData[]; -- -2.5.0 +2.7.4 diff --git a/0003-explicitely-link-with-libX11.patch b/0003-explicitely-link-with-libX11.patch deleted file mode 100644 index 44eba62..0000000 --- a/0003-explicitely-link-with-libX11.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 88edff506ae6d4eba8feeb8be7861fe6e14c2d47 Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -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 07702c4..719d33b 100644 ---- a/src/Main/CMakeLists.txt -+++ b/src/Main/CMakeLists.txt -@@ -145,6 +145,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 1cf6653..bc15f52 100644 ---- a/utils/fgviewer/CMakeLists.txt -+++ b/utils/fgviewer/CMakeLists.txt -@@ -52,5 +52,6 @@ target_link_libraries(fgviewer - ${OPENGL_LIBRARIES} - ${FGVIEWER_RTI_LIBRARIES} - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} -+ ${X11_X11_LIB} - ) - install(TARGETS fgviewer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --- -2.7.4 - diff --git a/0003-make-fglauncher-a-static-library.patch b/0003-make-fglauncher-a-static-library.patch new file mode 100644 index 0000000..6f018fa --- /dev/null +++ b/0003-make-fglauncher-a-static-library.patch @@ -0,0 +1,25 @@ +From 96ecbb4ef279d05b4df8a304d529893f37cb629e Mon Sep 17 00:00:00 2001 +From: Fabrice Bellet +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 aedf620..65735d2 100644 +--- a/src/GUI/CMakeLists.txt ++++ b/src/GUI/CMakeLists.txt +@@ -84,7 +84,7 @@ if (HAVE_QT) + qt5_add_resources(qrc_sources resources.qrc) + + +- add_library(fglauncher QtLauncher.cxx ++ add_library(fglauncher STATIC QtLauncher.cxx + QtLauncher.hxx + QtLauncher_private.hxx + BaseDiagram.cxx +-- +2.7.4 + diff --git a/0004-make-fglauncher-a-static-library.patch b/0004-make-fglauncher-a-static-library.patch deleted file mode 100644 index 1b96d81..0000000 --- a/0004-make-fglauncher-a-static-library.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 65469bacf5290f4d439ddf999d8b283d32f24b32 Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -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 18d4249..ee2669e 100644 ---- a/src/GUI/CMakeLists.txt -+++ b/src/GUI/CMakeLists.txt -@@ -79,7 +79,7 @@ if (HAVE_QT) - qt5_add_resources(qrc_sources resources.qrc) - - -- add_library(fglauncher QtLauncher.cxx -+ add_library(fglauncher STATIC QtLauncher.cxx - QtLauncher.hxx - QtLauncher_private.hxx - BaseDiagram.cxx --- -2.5.0 - diff --git a/FlightGear.spec b/FlightGear.spec index 73e2088..6e89f68 100644 --- a/FlightGear.spec +++ b/FlightGear.spec @@ -1,9 +1,9 @@ Name: FlightGear Summary: The FlightGear Flight Simulator -Version: 2016.3.1 -Release: 2%{?dist} +Version: 2016.4.2 +Release: 1%{?dist} License: GPLv2+ -Source0: https://sourceforge.net/projects/flightgear/files/release-2016.3/flightgear-%{version}.tar.bz2 +Source0: https://sourceforge.net/projects/flightgear/files/release-2016.4/flightgear-%{version}.tar.bz2 Source1: %{name}.desktop # these icons were previously available from # http://jrbabcock.home.comcast.net/flightgear/icons @@ -15,8 +15,7 @@ Source6: fg-128.png Source7: COPYING Patch1: 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch Patch2: 0002-Use-system-iaxclient-instead-of-bundled-one.patch -Patch3: 0003-explicitely-link-with-libX11.patch -Patch4: 0004-make-fglauncher-a-static-library.patch +Patch3: 0003-make-fglauncher-a-static-library.patch URL: http://www.flightgear.org/ BuildRequires: openal-soft-devel, SimGear-devel >= %{version} @@ -39,7 +38,6 @@ expanded and improved upon by anyone interested in contributing %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 rm -rf 3rdparty/iaxclient # make rpmlint happy @@ -169,6 +167,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Nov 25 2016 Fabrice Bellet - 2016.4.2-1 +- new upstream release + +* Mon Nov 21 2016 Fabrice Bellet - 2016.4.1-1 +- new upstream release + * Wed Sep 14 2016 Fabrice Bellet - 2016.3.1-2 - new upstream release diff --git a/sources b/sources index 2d87c38..d87ff20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70936a91c80ee18a7dd7ed663c0273e3 flightgear-2016.3.1.tar.bz2 +70545c691f3bb8a09e828bd4a17e81b5 flightgear-2016.4.2.tar.bz2