This commit was manufactured by cvs2git to create tag 'STABLE'.

Sprout from master 2002-08-28 22:34:47 UTC aflinta <aflinta@pld-linux.org> '- new'
Cherrypick from master 2002-09-14 08:33:43 UTC Sebastian Zagrodzki <sebek@zagrodzki.net> '- remove CVS directories':
    FlightGear-libs.patch -> 1.3
    FlightGear.spec -> 1.20

diff --git a/FlightGear-libs.patch b/FlightGear-libs.patch
new file mode 100644 (file)
index 0000000..fdc7f2d
--- /dev/null
+++ b/FlightGear-libs.patch
@@ -0,0 +1,9 @@
+diff -Naur FlightGear-0.8.0/tests/Makefile.am FlightGear-0.8.0-p/tests/Makefile.am
+--- FlightGear-0.8.0/tests/Makefile.am Tue Sep  3 00:24:33 2002
++++ FlightGear-0.8.0-p/tests/Makefile.am       Fri Sep 13 21:02:27 2002
+@@ -21,4 +21,4 @@
+ test_text_LDADD = $(base_LIBS)
+ 
+ test_up_SOURCES = test-up.cxx
+-test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul $(base_LIBS)
++test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul -lsgmisc -lsgxml -lz $(base_LIBS)

diff --git a/FlightGear.spec b/FlightGear.spec
index d218a4d9747273da02f633a1c556265800a4acec..e4d436a538db4f3996a217d18031cbcc6c171ff9 100644 (file)
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,18 +1,17 @@
 Summary:       Free Flight Simulator
 Summary(pl):   darmowy symulator lotu
 Name:          FlightGear
-Version:       0.7.10
+Version:       0.8.0
 Release:       1
 License:       GPL
 Group:         X11/Applications/Games
-Source0:       http://ftp.flightgear.org/pub/fgfs/Source/%{name}-%{version}.tar.gz
-Source1:       http://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.gz
-Source2:       http://ftp.flightgear.org/pub/fgfs/Shared/fgfs-docs-0.7.7.tar.gz
-Patch0:                %{name}-am_fix.patch
-Patch1:                %{name}-ac_fix.patch
+Source0:       ftp://ftp.flightgear.org/pub/fgfs/Source/%{name}-%{version}.tar.gz
+Source1:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-base-%{version}.tar.gz
+Source2:       ftp://ftp.flightgear.org/pub/fgfs/Shared/fgfs-docs-0.7.7.tar.gz
+Patch0:                %{name}-libs.patch
 URL:           http://www.flightgear.org/
 BuildRequires: OpenGL-devel
-BuildRequires: SimGear-devel >= 0.0.18
+BuildRequires: SimGear-devel >= 0.2.0
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
@@ -20,7 +19,7 @@ BuildRequires:        findutils
 BuildRequires: glut-devel
 BuildRequires: libstdc++-devel
 BuildRequires: metakit-devel
-BuildRequires: plib >= 1.2.0
+BuildRequires: plib >= 1.6.0
 BuildRequires: zlib-devel
 Requires:      OpenGL
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,9 +41,7 @@ rozpowszechnia
 %prep
 %setup -q -a 1 -a 2
 %patch0 -p1
-%patch1 -p1
-
-#find %{name}-0.7 -name 'CVS' -type d | xargs rm -rf
+find %{name} -name 'CVS' -type d | xargs rm -rf
 
 %build
 rm -f missing
@@ -79,4 +76,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gl-info
 %attr(755,root,root) %{_bindir}/js_demo
 %{_libdir}/%{name}
-%{_mandir}/*
+%{_mandir}/*/*