- updated to 0.9.6

Changed files:
    FlightGear-libs.patch -> 1.8
    FlightGear.spec -> 1.35

diff --git a/FlightGear-libs.patch b/FlightGear-libs.patch
index 85398aab996789f8a6b0887d88ba22c00a3cdfaf..5d51cec0f60b1ded1f5b99a87062ec65da86a606 100644 (file)
--- a/FlightGear-libs.patch
+++ b/FlightGear-libs.patch
@@ -1,33 +1,33 @@
-diff -urN aa/FlightGear-0.9.5/src/Airports/Makefile.am FlightGear-0.9.5/src/Airports/Makefile.am
---- aa/FlightGear-0.9.5/src/Airports/Makefile.am       2003-08-29 19:35:45.000000000 +0200
-+++ FlightGear-0.9.5/src/Airports/Makefile.am  2004-08-01 17:36:45.387128776 +0200
+diff -burN FlightGear-0.9.6.orig/src/Airports/Makefile.am FlightGear-0.9.6/src/Airports/Makefile.am
+--- FlightGear-0.9.6.orig/src/Airports/Makefile.am     2004-11-01 17:13:02.183256960 +0100
++++ FlightGear-0.9.6/src/Airports/Makefile.am  2004-11-01 17:13:54.304333352 +0100
 @@ -7,6 +7,7 @@
        simple.cxx simple.hxx
  
  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
++               -lsgprops -lsgstructure -lsgxml
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -urN aa/FlightGear-0.9.5/src/FDM/YASim/Makefile.am FlightGear-0.9.5/src/FDM/YASim/Makefile.am
---- aa/FlightGear-0.9.5/src/FDM/YASim/Makefile.am      2004-06-09 16:08:47.000000000 +0200
-+++ FlightGear-0.9.5/src/FDM/YASim/Makefile.am 2004-08-01 17:36:45.387128776 +0200
+diff -burN FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am FlightGear-0.9.6/src/FDM/YASim/Makefile.am
+--- FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am    2004-11-01 17:13:02.016282344 +0100
++++ FlightGear-0.9.6/src/FDM/YASim/Makefile.am 2004-11-01 17:14:28.542128416 +0100
 @@ -43,9 +43,9 @@
  
  yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
  
--yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure -lsgtiming  $(base_LIBS)
-+yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure -lsgtiming $(base_LIBS) -lz
+-yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
++yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
  
  proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
--proptest_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure  $(base_LIBS)
-+proptest_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure  $(base_LIBS) -lz
+-proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
++proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -urN aa/FlightGear-0.9.5/src/GUI/Makefile.am FlightGear-0.9.5/src/GUI/Makefile.am
---- aa/FlightGear-0.9.5/src/GUI/Makefile.am    2004-05-12 18:08:57.000000000 +0200
-+++ FlightGear-0.9.5/src/GUI/Makefile.am       2004-08-01 17:37:51.730043120 +0200
+diff -burN FlightGear-0.9.6.orig/src/GUI/Makefile.am FlightGear-0.9.6/src/GUI/Makefile.am
+--- FlightGear-0.9.6.orig/src/GUI/Makefile.am  2004-11-01 17:13:02.129265168 +0100
++++ FlightGear-0.9.6/src/GUI/Makefile.am       2004-11-01 17:14:41.744121408 +0100
 @@ -22,4 +22,4 @@
  
  layout_test_LDADD = libGUI.a \
@@ -35,10 +35,10 @@ diff -urN aa/FlightGear-0.9.5/src/GUI/Makefile.am FlightGear-0.9.5/src/GUI/Makef
 -                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS)
 \ Brak znaku nowej linii na koñcu pliku
 +                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) -lz
-diff -urN aa/FlightGear-0.9.5/src/Main/Makefile.am FlightGear-0.9.5/src/Main/Makefile.am
---- aa/FlightGear-0.9.5/src/Main/Makefile.am   2004-07-19 17:24:36.000000000 +0200
-+++ FlightGear-0.9.5/src/Main/Makefile.am      2004-08-01 17:36:45.388128624 +0200
-@@ -103,6 +103,6 @@
+diff -burN FlightGear-0.9.6.orig/src/Main/Makefile.am FlightGear-0.9.6/src/Main/Makefile.am
+--- FlightGear-0.9.6.orig/src/Main/Makefile.am 2004-11-01 17:13:02.143263040 +0100
++++ FlightGear-0.9.6/src/Main/Makefile.am      2004-11-01 17:15:10.865694256 +0100
+@@ -104,6 +104,6 @@
  metar_LDADD = \
          -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
          -lplibnet -lplibul $(network_LIBS) \
@@ -46,9 +46,9 @@ diff -urN aa/FlightGear-0.9.5/src/Main/Makefile.am FlightGear-0.9.5/src/Main/Mak
 +        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -urN aa/FlightGear-0.9.5/src/Navaids/Makefile.am FlightGear-0.9.5/src/Navaids/Makefile.am
---- aa/FlightGear-0.9.5/src/Navaids/Makefile.am        2004-06-09 16:08:48.000000000 +0200
-+++ FlightGear-0.9.5/src/Navaids/Makefile.am   2004-08-01 17:36:45.388128624 +0200
+diff -burN FlightGear-0.9.6.orig/src/Navaids/Makefile.am FlightGear-0.9.6/src/Navaids/Makefile.am
+--- FlightGear-0.9.6.orig/src/Navaids/Makefile.am      2004-11-01 17:13:02.239248448 +0100
++++ FlightGear-0.9.6/src/Navaids/Makefile.am   2004-11-01 17:15:37.842593144 +0100
 @@ -15,6 +15,6 @@
  # testnavs_LDADD = \
  #     libNavaids.a \
@@ -57,9 +57,9 @@ diff -urN aa/FlightGear-0.9.5/src/Navaids/Makefile.am FlightGear-0.9.5/src/Navai
 +#     -lsgstructure $(base_LIBS) -lz -lsgprops
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-diff -urN aa/FlightGear-0.9.5/tests/Makefile.am FlightGear-0.9.5/tests/Makefile.am
---- aa/FlightGear-0.9.5/tests/Makefile.am      2004-06-09 16:08:50.000000000 +0200
-+++ FlightGear-0.9.5/tests/Makefile.am 2004-08-01 17:36:45.389128472 +0200
+diff -burN FlightGear-0.9.6.orig/tests/Makefile.am FlightGear-0.9.6/tests/Makefile.am
+--- FlightGear-0.9.6.orig/tests/Makefile.am    2004-11-01 17:13:02.274243128 +0100
++++ FlightGear-0.9.6/tests/Makefile.am 2004-11-01 17:15:59.265336392 +0100
 @@ -17,4 +17,4 @@
  test_text_SOURCES = test-text.cxx
  

diff --git a/FlightGear.spec b/FlightGear.spec
index fdb011cac4a9148ac7dd286a2dc32b1717fc7179..11aefc33f0f04d4b33a09180c1bd32c5436e2b95 100644 (file)
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,14 +1,14 @@
 Summary:       Free Flight Simulator
 Summary(pl):   darmowy symulator lotu
 Name:          FlightGear
-Version:       0.9.5
+Version:       0.9.6
 Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       ftp://ftp.flightgear.org/pub/fgfs/Source/%{name}-%{version}.tar.gz
-# Source0-md5: ff744ab274fe853efc168b77e08d7dd0
-Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.gz
-# Source1-md5: a6e24de5b265f335f3bffc7261690428
+# Source0-md5: ab6e8826a392eaa15bd0224eba2f2a38
+Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.bz2
+# Source1-md5: fc167ed777d2fe184940541670bc72b1
 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