- Version 0.9.10-1.

Changed files:
    FlightGear-libs.patch -> 1.10
    FlightGear.spec -> 1.41

diff --git a/FlightGear-libs.patch b/FlightGear-libs.patch
index c2ab15e10efce8170df539bed5596fbed0038e90..42f52cb3c69173a72fc808a6597665999aeafc43 100644 (file)
--- a/FlightGear-libs.patch
+++ b/FlightGear-libs.patch
@@ -66,3 +66,61 @@ diff -burN FlightGear-0.9.6.orig/tests/Makefile.am FlightGear-0.9.6/tests/Makefi
 +                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) \
 +                  -lxml
 +
+--- FlightGear-0.9.10/utils/GPSsmooth/Makefile.am.orig 2006-08-16 20:29:39.000000000 -0700
++++ FlightGear-0.9.10/utils/GPSsmooth/Makefile.am      2006-08-16 20:36:00.000000000 -0700
+@@ -5,7 +5,7 @@
+       gps_main.cxx
+ 
+ GPSsmooth_LDADD = \
+-      -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul \
++      -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul -lsgprops -lsgxml -lsgmisc -lsgstructure \
+       $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
+ 
+ MIDGsmooth_SOURCES = \
+@@ -13,7 +13,7 @@
+       MIDG_main.cxx
+ 
+ MIDGsmooth_LDADD = \
+-      -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \
++      -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug -lsgstructure -lsgprops -lsgxml \
+       -lplibnet -lplibul \
+       $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
+ 
+--- FlightGear-0.9.10/utils/Modeller/Makefile.am.orig  2006-08-16 20:36:44.000000000 -0700
++++ FlightGear-0.9.10/utils/Modeller/Makefile.am       2006-08-16 20:38:58.000000000 -0700
+@@ -8,4 +8,6 @@
+ animassist_LDADD = $(base_LIBS)
+ 
+ normalmap_SOURCES = normalmap.cxx
+-normalmap_LDADD = -lsgscreen $(opengl_LIBS) $(base_LIBS) -lz
++normalmap_LDADD = -lsgscreen -lsgdebug \
++      -lplibssg -lplibsg -lplibul \
++      $(opengl_LIBS) $(base_LIBS) -lz
+--- FlightGear-0.9.10/src/Main/metar_main.cxx.orig     2006-08-16 20:26:14.000000000 -0700
++++ FlightGear-0.9.10/src/Main/metar_main.cxx  2006-08-16 20:26:55.000000000 -0700
+@@ -28,6 +28,10 @@
+ #include <simgear/environment/metar.hxx>
+ #include <simgear/structure/exception.hxx>
+ 
++// Not really used there definitions - just to fix missing symbol in libsgsky.so.
++class SGSky;
++SGSky *thesky;
++
+ using namespace std;
+ 
+ // text color
+--- FlightGear-0.9.10/src/Main/Makefile.am.mkorig      2006-08-17 14:09:38.000000000 -0700
++++ FlightGear-0.9.10/src/Main/Makefile.am     2006-08-17 14:16:55.000000000 -0700
+@@ -106,8 +106,9 @@
+ metar_SOURCES = metar_main.cxx
+ 
+ metar_LDADD = \
+-        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
+-        -lplibnet -lplibul $(network_LIBS) \
+-        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
++        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug -lsgsky  \
++        -lplibnet -lplibul -lplibsg -lplibssg -lopenal $(network_LIBS) \
++        -lz -lGLU $(base_LIBS) -lsgserial -lsgprops -lsgxml -lsgscreen -lsgsound -lsgmath
++
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim

diff --git a/FlightGear.spec b/FlightGear.spec
index 9cb47a7541ac63a2617e98ef7b3e7a65447bc676..98aad750775e74308c4a387060184b2906d4cbe0 100644 (file)
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,31 +1,36 @@
+# TODO:
+# - Make FlightGear-extra-planes for subset of planes from
+#   http://www.flightgear.org/Downloads/aircraft/index.shtml
+
 Summary:       Free Flight Simulator
 Summary(pl):   darmowy symulator lotu
 Name:          FlightGear
-Version:       0.9.9
-Release:       0.9
+Version:       0.9.10
+Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       ftp://ftp.flightgear.org/pub/fgfs/Source/%{name}-%{version}.tar.gz
-# Source0-md5: c1bff0cc9eda34f2a31ec9cd4e5216e6
+# Source0-md5: f4b89c9cafc18d56beab77a04f1ebdce
 Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.bz2
-# Source1-md5: c262f7022479c249c486a195d6755579
+# Source1-md5: 0ff82689a1877de95490c429e717d8a2
 Source2:       ftp://ftp.flightgear.org/pub/fgfs/Everything-0.7/Base-Packages/fgfs-docs-0.7.7.tar.gz
 # Source2-md5: 31f35d3e63e522565e8990ead99e7507
 Patch0:                %{name}-libs.patch
 URL:           http://www.flightgear.org/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenGL-devel
-BuildRequires: SimGear-devel >= 0.3.9
+BuildRequires: SimGear-devel >= 0.3.10
 BuildRequires: XFree86-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: glut-devel
 BuildRequires: libstdc++-devel
+BuildRequires: libxml-devel
 BuildRequires: metakit-devel >= 2.4.3
 BuildRequires: plib-devel >= 1.8.4
 BuildRequires: zlib-devel
 Requires:      OpenGL
-Requires:      SimGear >= 0.3.9
+Requires:      SimGear >= 0.3.10
 Requires:      plib >= 1.8.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,6 +49,7 @@ rozpowszechnia
 %prep
 %setup -q -a 1 -a 2
 %patch0 -p1
+
 find %{name} -name 'CVS' -type d | xargs rm -rf
 
 %build
@@ -77,6 +83,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS %{name}/Docs/*
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
 %{_datadir}/games/%{name}
 %{_mandir}/*/*