[FlightGear] new upstream release
Fabrice Bellet
bellet at fedoraproject.org
Mon Oct 20 08:50:15 UTC 2014
commit b11d89aec5a0a94e5581a9440e96216345294638
Author: Fabrice Bellet <fabrice at bellet.info>
Date: Mon Oct 20 10:49:05 2014 +0200
new upstream release
.gitignore | 1 +
...-sure-that-n-is-not-being-set-as-format-t.patch | 4 +-
...ke-ShivaVG-and-FGAdminUI-static-libraries.patch | 11 ++--
...e-system-iaxclient-instead-of-bundled-one.patch | 56 +++++++++++--------
FlightGear.spec | 13 +++--
sources | 2 +-
6 files changed, 49 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1b55f6..3e9a1f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ FlightGear-2.0.0.tar.gz
/flightgear-2.10.0.tar.bz2
/flightgear-2.12.0.tar.bz2
/flightgear-3.0.0.tar.bz2
+/flightgear-3.2.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 581175d..7e6bc20 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 f279f5bdf189dc61b1e2d65bc4faff4806892449 Mon Sep 17 00:00:00 2001
+From f315a72f129d3baaa616ac3936a6e6bf13fcaffb 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.8.5.3
+1.9.3
diff --git a/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch b/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
index a1eb38e..f020e76 100644
--- a/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
+++ b/0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
@@ -1,4 +1,4 @@
-From f6d44c6da6fa06e5a6461acbac98f3076b197316 Mon Sep 17 00:00:00 2001
+From 2e8ac7b5e09cd821b50e0c1745a15edbcaba2bc8 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
@@ -8,17 +8,16 @@ Subject: [PATCH] make ShivaVG and FGAdminUI static libraries
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/fgadmin/src/CMakeLists.txt b/utils/fgadmin/src/CMakeLists.txt
-index 42b95d7..793452e 100644
+index ef98c6c..275f4c6 100644
--- a/utils/fgadmin/src/CMakeLists.txt
+++ b/utils/fgadmin/src/CMakeLists.txt
-@@ -1,6 +1,6 @@
-
+@@ -1,5 +1,5 @@
fltk_wrap_ui(FGAdminUI fgadmin.fl)
-add_library(FGAdminUI ${FGAdminUI_FLTK_UI_SRCS})
+add_library(FGAdminUI STATIC ${FGAdminUI_FLTK_UI_SRCS})
- add_executable(fgadmin fgadmin_funcs.cxx main.cxx untarka.c)
+ add_executable(fgadmin WIN32 fgadmin_funcs.cxx main.cxx untarka.c)
add_dependencies(fgadmin FGAdminUI)
--
-1.8.5.3
+1.9.3
diff --git a/0003-Use-system-iaxclient-instead-of-bundled-one.patch b/0003-Use-system-iaxclient-instead-of-bundled-one.patch
index b40621e..5687adc 100644
--- a/0003-Use-system-iaxclient-instead-of-bundled-one.patch
+++ b/0003-Use-system-iaxclient-instead-of-bundled-one.patch
@@ -1,40 +1,48 @@
-From 6ae872237a0afe973ce34ea358df47f003ccf11d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
-Date: Thu, 20 Mar 2014 12:40:17 +0100
+From 899cd9a2d821137c545560880f63d99c0f6538d8 Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice at bellet.info>
+Date: Fri, 12 Sep 2014 17:15:55 +0200
Subject: [PATCH] Use system iaxclient instead of bundled one
---
- CMakeLists.txt | 2 --
+ 3rdparty/CMakeLists.txt | 4 ----
+ CMakeLists.txt | 1 -
src/Main/CMakeLists.txt | 2 +-
src/Network/fgcom.cxx | 2 +-
utils/fgcom/CMakeLists.txt | 4 +---
- 4 files changed, 3 insertions(+), 7 deletions(-)
+ 5 files changed, 3 insertions(+), 10 deletions(-)
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index ec9822c..a385193 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -3,10 +3,6 @@ if (NOT SYSTEM_SQLITE)
+ add_subdirectory(sqlite3)
+ endif()
+
+-if (ENABLE_IAX)
+- add_subdirectory(iaxclient/lib)
+-endif()
+-
+ add_subdirectory(mongoose)
+ add_subdirectory(cjson)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 510d779..fcda788 100644
+index 1824861..bcb802d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -364,7 +364,6 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
+@@ -186,7 +186,6 @@ endif()
- include_directories(${PROJECT_SOURCE_DIR})
- include_directories(${PROJECT_SOURCE_DIR}/src)
--include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
- # following is needed, because config.h is include 'bare', whereas
- # version.h is included as <Include/version.h> - this should be cleaned up
- include_directories(${PROJECT_BINARY_DIR}/src)
-@@ -387,7 +386,6 @@ configure_file (
- "${PROJECT_BINARY_DIR}/src/Include/version.h"
- )
+ if(ENABLE_FGCOM)
+ set(ENABLE_IAX 1)
+- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
+ endif()
--add_subdirectory(3rdparty)
- add_subdirectory(utils)
- add_subdirectory(src)
- add_subdirectory(man)
+ # Setup MSVC 3rd party directories
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
-index 5512db2..7a63483 100644
+index f799ae6..487f053 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
-@@ -90,7 +90,7 @@ if(ENABLE_JSBSIM)
+@@ -117,7 +117,7 @@ if(ENABLE_JSBSIM)
target_link_libraries(fgfs JSBSim)
endif()
if(ENABLE_IAX)
@@ -44,7 +52,7 @@ index 5512db2..7a63483 100644
if(USE_DBUS)
target_link_libraries(fgfs ${DBUS_LIBRARIES})
diff --git a/src/Network/fgcom.cxx b/src/Network/fgcom.cxx
-index 1f3e728..676fe7c 100644
+index 8d1bfc9..b501bd7 100644
--- a/src/Network/fgcom.cxx
+++ b/src/Network/fgcom.cxx
@@ -39,7 +39,7 @@
@@ -72,5 +80,5 @@ index 2629d89..f3a4530 100644
target_link_Libraries( ${name}
${OPENAL_LIBRARY}
--
-1.8.5.3
+1.9.3
diff --git a/FlightGear.spec b/FlightGear.spec
index ef9bf3b..ee44270 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,10 +1,10 @@
Name: FlightGear
Summary: The FlightGear Flight Simulator
-Version: 3.0.0
-Release: 8%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
-Source0: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
+Source0: http://mirrors.ibiblio.org/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
Source1: %{name}.desktop
# these icons were previously available from
# http://jrbabcock.home.comcast.net/flightgear/icons
@@ -25,6 +25,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
Requires: FlightGear-data >= %{version}, opengl-games-utils
Requires: hicolor-icon-theme
@@ -39,7 +40,7 @@ expanded and improved upon by anyone interested in contributing
%patch1 -p1
%patch2 -p1
%patch3 -p1
-rm -r 3rdparty
+rm -rf 3rdparty/iaxclient
# make rpmlint happy
find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -62,7 +63,6 @@ cp %{SOURCE7} COPYING.icons
%build
%{cmake} \
-DSIMGEAR_SHARED=ON \
- -DJPEG_FACTORY=ON \
-DSYSTEM_SQLITE=ON \
-DFG_DATA_DIR:PATH=%{_datadir}/flightgear \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/flightgear/*
%changelog
+* Fri Oct 17 2014 Fabrice Bellet <fabrice at bellet.info> - 3.2.0-1
+- new upstream release
+
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 43ad95f..ba0ecba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e943e17db110e2f9e82a00acaaa11790 flightgear-3.0.0.tar.bz2
+0a16920cc22ea070f8bb345e76c55e05 flightgear-3.2.0.tar.bz2
More information about the scm-commits
mailing list