[SimGear] new upstream release

[Fabrice Bellet]

commit 8c41b40a461fbe1a91104f3f87cfa663d038de2a
Author: Fabrice Bellet <fabrice at bellet.info>
Date:   Mon Oct 20 09:39:11 2014 +0200

    new upstream release

 .gitignore                                         |    1 +
 0001-remove-unneeded-header.patch                  |    6 +++---
 ...-sure-that-n-is-not-being-set-as-format-t.patch |   10 +++++-----
 SimGear.spec                                       |    9 ++++++---
 sources                                            |    2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80d8118..8b8066c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ SimGear-2.0.0.tar.gz
 /simgear-2.10.0.tar.bz2
 /simgear-2.12.0.tar.bz2
 /simgear-3.0.0.tar.bz2
+/simgear-3.2.0.tar.bz2
diff --git a/0001-remove-unneeded-header.patch b/0001-remove-unneeded-header.patch
index d0d1367..dfd01a2 100644
--- a/0001-remove-unneeded-header.patch
+++ b/0001-remove-unneeded-header.patch
@@ -1,7 +1,7 @@
-From f485a4e49cddeef436a212bc655799e71a9648a7 Mon Sep 17 00:00:00 2001
+From 7582f901238bd6e953568ec6d9de9cc373b01220 Mon Sep 17 00:00:00 2001
 From: Fabrice Bellet <fabrice at bellet.info>
 Date: Sun, 22 Sep 2013 11:54:54 +0200
-Subject: [PATCH 1/3] remove unneeded header
+Subject: [PATCH] remove unneeded header
 
 ---
  simgear/misc/stopwatch.hxx | 4 ----
@@ -23,5 +23,5 @@ index 3436438..70df459 100644
  #  define HAVE_GETRUSAGE
  #endif
 -- 
-1.8.3.1
+1.9.3
 
diff --git a/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch b/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
index 033305d..f4debb0 100644
--- a/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
+++ b/0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -1,7 +1,7 @@
-From 26fbf7c70010c7a16bdfe98a3282a13c9defd8b9 Mon Sep 17 00:00:00 2001
+From 15ed31a1ed2f3ef45a620917dd97f828e4fd33be Mon Sep 17 00:00:00 2001
 From: Fabrice Bellet <fabrice at bellet.info>
 Date: Sun, 22 Sep 2013 11:56:12 +0200
-Subject: [PATCH 2/3] check to be sure that %n is not being set as format type
+Subject: [PATCH] check to be sure that %n is not being set as format type
  (CVE-2012-2090)
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] check to be sure that %n is not being set as format type
  1 file changed, 10 insertions(+)
 
 diff --git a/simgear/scene/model/SGText.cxx b/simgear/scene/model/SGText.cxx
-index ca065b1..edf80bd 100644
+index 1da6c57..3093d82 100644
 --- a/simgear/scene/model/SGText.cxx
 +++ b/simgear/scene/model/SGText.cxx
-@@ -76,6 +76,16 @@ void SGText::UpdateCallback::operator()(osg::Node * node, osg::NodeVisitor *nv )
+@@ -68,6 +68,16 @@ void SGText::UpdateCallback::operator()(osg::Node * node, osg::NodeVisitor *nv )
    // FIXME:
    // hopefully the users never specifies bad formats here
    // this should better be something more robust
@@ -30,5 +30,5 @@ index ca065b1..edf80bd 100644
    if( numeric ) {
      double d = property->getDoubleValue() * scale + offset;
 -- 
-1.8.3.1
+1.9.3
 
diff --git a/SimGear.spec b/SimGear.spec
index 8127b89..2df91b0 100644
--- a/SimGear.spec
+++ b/SimGear.spec
@@ -1,11 +1,11 @@
 Name:           SimGear
-Version:        3.0.0
-Release:        6%{?dist}
+Version:        3.2.0
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 Summary:        Simulation library components
 URL:            http://simgear.sourceforge.net
-Source0:        http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-%{version}.tar.bz2
+Source0:        http://mirrors.ibiblio.org/simgear/ftp/Source/simgear-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:         0001-remove-unneeded-header.patch
 Patch2:         0002-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/SimGearCore
 
 %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-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 75a6968..1d5f334 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-097f55962dfc48b3e740334dbfda64a6  simgear-3.0.0.tar.bz2
+d6aac26bf8876391a7d5f4381fc98c01  simgear-3.2.0.tar.bz2