- updated to 0.9.4

Changed files:
    FlightGear-libs.patch -> 1.6
    FlightGear.spec -> 1.32

diff --git a/FlightGear-libs.patch b/FlightGear-libs.patch
index 4295834f1ed5250df63610a2617d59c5cda0a9bd..bf42bd1f4d285774efe55349c36bedc64a29e1b2 100644 (file)
--- a/FlightGear-libs.patch
+++ b/FlightGear-libs.patch
@@ -1,32 +1,56 @@
-diff -urN aaa/FlightGear-0.9.3/src/FDM/YASim/Makefile.am FlightGear-0.9.3/src/FDM/YASim/Makefile.am
---- aaa/FlightGear-0.9.3/src/FDM/YASim/Makefile.am     2003-10-16 16:40:26.000000000 +0200
-+++ FlightGear-0.9.3/src/FDM/YASim/Makefile.am 2003-11-11 01:57:06.000000000 +0100
-@@ -39,6 +39,6 @@
+diff -Naur FlightGear-0.9.4/src/Airports/Makefile.am FlightGear-0.9.4-p/src/Airports/Makefile.am
+--- FlightGear-0.9.4/src/Airports/Makefile.am  Fri Aug 29 19:35:45 2003
++++ FlightGear-0.9.4-p/src/Airports/Makefile.am        Sat Apr  3 22:53:31 2004
+@@ -7,6 +7,7 @@
+       simple.cxx simple.hxx
  
- yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCES)
+ calc_loc_SOURCES = calc_loc.cxx
+-calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS)
++calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) \
++      -lsgprops -lsgstructure -lsgxml
  
--yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgstructure  $(base_LIBS)
-+yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgtiming  $(base_LIBS) -lz
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+diff -Naur FlightGear-0.9.4/src/FDM/YASim/Makefile.am FlightGear-0.9.4-p/src/FDM/YASim/Makefile.am
+--- FlightGear-0.9.4/src/FDM/YASim/Makefile.am Fri Jan  9 21:01:22 2004
++++ FlightGear-0.9.4-p/src/FDM/YASim/Makefile.am       Mon Mar 29 14:44:33 2004
+@@ -40,6 +40,6 @@
+ 
+ yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
+ 
+-yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure  $(base_LIBS)
++yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure -lsgtiming $(base_LIBS) -lz
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+diff -Naur FlightGear-0.9.4/src/Main/Makefile.am FlightGear-0.9.4-p/src/Main/Makefile.am
+--- FlightGear-0.9.4/src/Main/Makefile.am      Tue Mar 16 21:27:15 2004
++++ FlightGear-0.9.4-p/src/Main/Makefile.am    Sat Apr  3 23:39:55 2004
+@@ -94,6 +94,6 @@
+ metar_LDADD = \
+         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
+         -lplibnet -lplibul $(network_LIBS) \
+-        -lz $(base_LIBS)
++        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -urN aaa/FlightGear-0.9.3/src/Navaids/Makefile.am FlightGear-0.9.3/src/Navaids/Makefile.am
---- aaa/FlightGear-0.9.3/src/Navaids/Makefile.am       2003-08-29 19:35:49.000000000 +0200
-+++ FlightGear-0.9.3/src/Navaids/Makefile.am   2003-11-11 02:02:33.000000000 +0100
+diff -Naur FlightGear-0.9.4/src/Navaids/Makefile.am FlightGear-0.9.4-p/src/Navaids/Makefile.am
+--- FlightGear-0.9.4/src/Navaids/Makefile.am   Fri Aug 29 19:35:49 2003
++++ FlightGear-0.9.4-p/src/Navaids/Makefile.am Sat Apr  3 23:34:04 2004
 @@ -11,7 +11,7 @@
  testnavs_SOURCES = testnavs.cxx
  testnavs_LDADD = \
        libNavaids.a \
 -      -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
+-      $(base_LIBS) -lz
 +      -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml -lsgstructure \
-       $(base_LIBS) -lz
++      $(base_LIBS) -lz -lsgprops
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -urN aaa/FlightGear-0.9.3/tests/Makefile.am FlightGear-0.9.3/tests/Makefile.am
---- aaa/FlightGear-0.9.3/tests/Makefile.am     2003-08-29 19:35:51.000000000 +0200
-+++ FlightGear-0.9.3/tests/Makefile.am 2003-11-11 01:57:06.000000000 +0100
+diff -Naur FlightGear-0.9.4/tests/Makefile.am FlightGear-0.9.4-p/tests/Makefile.am
+--- FlightGear-0.9.4/tests/Makefile.am Fri Aug 29 19:35:51 2003
++++ FlightGear-0.9.4-p/tests/Makefile.am       Sat Apr  3 22:51:55 2004
 @@ -17,4 +17,4 @@
  test_text_SOURCES = test-text.cxx
  
  test_up_SOURCES = test-up.cxx
 -test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul $(base_LIBS)
-+test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul -lsgmisc -lsgxml -lsgstructure -lsgtiming -lz $(base_LIBS)
++test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul -lsgmisc -lsgxml -lsgstructure -lsgtiming -lz $(base_LIBS) -lsgprops

diff --git a/FlightGear.spec b/FlightGear.spec
index dad3cac2f920a23b77cae83b31eede4d29fd9446..b635ed23f0f17ad32fb5952e40f4f2ee1bf8ba4b 100644 (file)
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,20 +1,20 @@
 Summary:       Free Flight Simulator
 Summary(pl):   darmowy symulator lotu
 Name:          FlightGear
-Version:       0.9.3
-Release:       2
+Version:       0.9.4
+Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       ftp://ftp.flightgear.org/pub/fgfs/Source/%{name}-%{version}.tar.gz
-# Source0-md5: 6e5b672fb0167f73a4e4346a9a6250e3
-Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.gz
-# Source1-md5: ac58d5a0b7fc67060892773d98d994e2
+# Source0-md5: c815fd8117ebad44db2c9e0fe868cf26
+Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.bz2
+# Source1-md5: 9dcb351455b13cd8892612f69d6285fe
 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: OpenGL-devel
-BuildRequires: SimGear-devel >= 0.3.4-2
+BuildRequires: SimGear-devel >= 0.3.5
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
@@ -76,5 +76,6 @@ 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}/*/*