rpms/FlightGear-Atlas/devel FlightGear-Atlas-0.3.1-build-fixes.patch, NONE, 1.1 FlightGear-Atlas.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Jan 7 17:25:19 UTC 2009

Author: bellet

Update of /cvs/pkgs/rpms/FlightGear-Atlas/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12494/devel

Modified Files:
	.cvsignore sources 
Added Files:
	FlightGear-Atlas-0.3.1-build-fixes.patch FlightGear-Atlas.spec 
	import.log 
Log Message:
Setup of module FlightGear-Atlas


FlightGear-Atlas-0.3.1-build-fixes.patch:

--- NEW FILE FlightGear-Atlas-0.3.1-build-fixes.patch ---
diff -uNrp Atlas-0.3.1.orig/src/Atlas.cxx Atlas-0.3.1.buildfixes/src/Atlas.cxx
--- Atlas-0.3.1.orig/src/Atlas.cxx	2006-10-28 18:28:32.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Atlas.cxx	2008-12-14 19:18:15.000000000 +0100
@@ -29,12 +29,14 @@
 #include <memory.h>
 #include <stdio.h>
 #include <simgear/compiler.h>
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include <string>
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/io/sg_serial.hxx>
+#include <iostream>
 
 #include "MapBrowser.hxx"
 #include "Overlays.hxx"
@@ -42,6 +44,8 @@
 
 #define SCALECHANGEFACTOR 1.3f
 
+using namespace std;
+
 SGIOChannel *input_channel;
 
 bool dragmode = false;
diff -uNrp Atlas-0.3.1.orig/src/fg_mkdir.cxx Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx
--- Atlas-0.3.1.orig/src/fg_mkdir.cxx	2005-01-28 13:54:12.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/fg_mkdir.cxx	2008-12-14 19:29:06.000000000 +0100
@@ -34,6 +34,7 @@
 #endif
 #include <string.h>
 #include <string>
+#include <stdlib.h>
 
 using namespace std;
 
diff -uNrp Atlas-0.3.1.orig/src/FlightTrack.hxx Atlas-0.3.1.buildfixes/src/FlightTrack.hxx
--- Atlas-0.3.1.orig/src/FlightTrack.hxx	2003-01-07 22:51:12.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/FlightTrack.hxx	2008-12-14 19:16:24.000000000 +0100
@@ -27,7 +27,7 @@
 #include <plib/sg.h>
 #include <simgear/compiler.h>
 
-SG_USING_STD(list);
+using namespace std;
 
 struct FlightData {
   float lat, lon, alt, hdg, spd;
diff -uNrp Atlas-0.3.1.orig/src/MapBrowser.hxx Atlas-0.3.1.buildfixes/src/MapBrowser.hxx
--- Atlas-0.3.1.orig/src/MapBrowser.hxx	2006-10-28 18:28:32.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapBrowser.hxx	2008-12-14 19:15:36.000000000 +0100
@@ -27,11 +27,13 @@
 #include "FlightTrack.hxx"
 #include "Projection.hxx"
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #include <math.h>
 #include <list>
 #include <map>
 
+using namespace std;
+
 class MapBrowser {
 public:
   static const int CACHE_LIMIT = 2;
diff -uNrp Atlas-0.3.1.orig/src/Map.cxx Atlas-0.3.1.buildfixes/src/Map.cxx
--- Atlas-0.3.1.orig/src/Map.cxx	2006-10-26 23:45:05.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Map.cxx	2008-12-14 19:22:18.000000000 +0100
@@ -39,7 +39,7 @@
 #include <plib/ul.h>
 
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #ifdef UL_GLX
 #  define GLX_GLXEXT_PROTOTYPES
 #  ifdef __APPLE__
@@ -50,7 +50,8 @@
 #elif defined UL_WIN32
 #  include <windows.h>
 #endif
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -65,10 +66,10 @@
 #include <simgear/screen/RenderTexture.h>
 #include "Scenery.hxx"
 #include <vector>
-#include STL_STRING
+#include <string>
+#include <iostream>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
diff -uNrp Atlas-0.3.1.orig/src/MapMaker.cxx Atlas-0.3.1.buildfixes/src/MapMaker.cxx
--- Atlas-0.3.1.orig/src/MapMaker.cxx	2005-09-29 21:18:01.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapMaker.cxx	2008-12-14 19:25:59.000000000 +0100
@@ -31,8 +31,12 @@
 #endif
 #include <sys/stat.h>
 #include <plib/ul.h>
+#include <iostream>
 
 #include "MapMaker.hxx"
+
+using namespace std;
+
 /*#include <simgear/magvar/magvar.hxx>*/
 
 // Utility function that I needed to put somewhere - this probably isn't the best place for it.
@@ -653,15 +657,13 @@ int MapMaker::process_binary_file( char 
 
   /* convert point_list of wgs84 nodes to a list of points transformed
      into the maps local coordinate system */
-  const point_list wgs84_nodes = tile.get_wgs84_nodes();
-  for ( point_list::const_iterator node = wgs84_nodes . begin(); 
-	node != wgs84_nodes . end();
-	node++ ) {
+  std::vector<SGVec3d> wgs84_nodes = tile.get_wgs84_nodes();
+  for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
 
     float *nv = new sgVec3;
-    for (i = 0; i < 3; i++) {
-      tmp[i] = (*node)[i];
-    }
+    tmp[0] = wgs84_nodes[i].x();
+    tmp[1] = wgs84_nodes[i].y();
+    tmp[2] = wgs84_nodes[i].z();
     
     sgAddVec3(tmp, gbs);
     double pr = sgLengthVec3( tmp );
@@ -674,17 +676,15 @@ int MapMaker::process_binary_file( char 
   }
 
   // same as above for normals
-  const point_list m_norms = tile.get_normals();
-  for ( point_list::const_iterator normal = m_norms.begin(); 
-	normal != m_norms.end();
-	normal++ ) {
+  std::vector<SGVec3f> m_norms = tile.get_normals();
+  for ( i = 0; i < (int)m_norms.size(); ++i ) {
     // Make a new normal
     float *nn = new sgVec3;
     
-    for (i = 0; i < 3; i++) {
-      nn[i] = (*normal)[i];
-    }
-    
+    nn[0]=m_norms[i].x();
+    nn[1]=m_norms[i].y();
+    nn[2]=m_norms[i].z();
+
     n.push_back( nn );
     normals++;
   }
diff -uNrp Atlas-0.3.1.orig/src/MapMaker.hxx Atlas-0.3.1.buildfixes/src/MapMaker.hxx
--- Atlas-0.3.1.orig/src/MapMaker.hxx	2005-02-26 19:40:36.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/MapMaker.hxx	2008-12-14 19:21:14.000000000 +0100
@@ -31,15 +31,12 @@
 #include <vector>
 #include <list>
 #include <map>
-#include STL_STRING
+#include <string>
 
 #include "Output.hxx"
 #include "Overlays.hxx"
 #include "Geodesy.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
-
 // Utility function that I needed to put somewhere - this probably isn't the best place for it.
 // Appends a path separator to a directory path if not present.
 // Calling function MUST ENSURE that there is space allocated for the potential strcat.
diff -uNrp Atlas-0.3.1.orig/src/MapPS.cxx Atlas-0.3.1.buildfixes/src/MapPS.cxx
--- Atlas-0.3.1.orig/src/MapPS.cxx	2005-09-29 21:18:01.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/MapPS.cxx	2008-12-14 19:30:05.000000000 +0100
@@ -38,9 +38,9 @@
 #include "OutputPS.hxx"
 #include <plib/ul.h>
 #include "Scenery.hxx"
+#include <iostream>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 
diff -uNrp Atlas-0.3.1.orig/src/OutputGL.hxx Atlas-0.3.1.buildfixes/src/OutputGL.hxx
--- Atlas-0.3.1.orig/src/OutputGL.hxx	2005-02-26 19:40:37.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/OutputGL.hxx	2008-12-09 16:24:17.000000000 +0100
@@ -2,7 +2,8 @@
 #define __OUTPUTGL_H__
 
 #include <simgear/compiler.h>
-#include SG_GLUT_H
+#include <GL/gl.h>
+#include <GL/glut.h>
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include "Output.hxx"
diff -uNrp Atlas-0.3.1.orig/src/Overlays.cxx Atlas-0.3.1.buildfixes/src/Overlays.cxx
--- Atlas-0.3.1.orig/src/Overlays.cxx	2006-10-26 13:56:25.000000000 +0200
+++ Atlas-0.3.1.buildfixes/src/Overlays.cxx	2008-12-14 19:13:40.000000000 +0100
@@ -27,7 +27,7 @@
 #include "Overlays.hxx"
 #include "Geodesy.hxx"
 
-SG_USING_STD(map);
+using namespace std;
 
 #ifdef _MSC_VER
 
diff -uNrp Atlas-0.3.1.orig/src/Overlays.hxx Atlas-0.3.1.buildfixes/src/Overlays.hxx
--- Atlas-0.3.1.orig/src/Overlays.hxx	2005-01-10 14:15:53.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/Overlays.hxx	2008-12-14 19:14:53.000000000 +0100
@@ -35,6 +35,8 @@
 #include "FlightTrack.hxx"
 #include "Projection.hxx"
 
+using namespace std;
+
 class Overlays {
 public:
   static const int OVERLAY_AIRPORTS    = 1 << 0;
diff -uNrp Atlas-0.3.1.orig/src/Scenery.cxx Atlas-0.3.1.buildfixes/src/Scenery.cxx
--- Atlas-0.3.1.orig/src/Scenery.cxx	2005-02-26 19:39:14.000000000 +0100
+++ Atlas-0.3.1.buildfixes/src/Scenery.cxx	2008-12-14 19:27:15.000000000 +0100
@@ -3,8 +3,7 @@
 
 #include "MapMaker.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using namespace std;
 
 typedef vector<string> string_list;
 


--- NEW FILE FlightGear-Atlas.spec ---
Name:		FlightGear-Atlas
Summary:	Flightgear map tools
Version:	0.3.1
Release:	10%{?dist}

License:	GPLv2+
Group:		Amusements/Games
Source0:	http://downloads.sourceforge.net/sourceforge/atlas/Atlas-%{version}.tar.gz
Source1:	Atlas-default-maps.tar.gz
Patch0:		FlightGear-Atlas-0.3.1-build-fixes.patch
URL:		http://atlas.sourceforge.net
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	freeglut-devel, curl-devel, libpng-devel
BuildRequires:	SimGear-devel >= 1.9.0, OpenSceneGraph-devel
Requires:	FlightGear-data
Obsoletes:	fgfs-Atlas < 0.3.1-10

%description
Atlas aims to produce and display high quality charts of the world for
users of FlightGear, an open source flight simulator. This is achieved
through two main parts: The map creator (simply called Map) and the
Atlas viewer

%prep
%setup -q -n Atlas-%{version}
%patch0 -p1 -b .buildfixes
find -type f -name '*.[hc]xx' -exec chmod a-x {} \;

%build
%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC" --with-fgbase=%{_datadir}/FlightGear
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear
tar zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/FlightGear

# this script is buggy and duplicates a fonctionnality now included in
# the Atlas program
rm -f $RPM_BUILD_ROOT%{_bindir}/buildmaps.sh

# the palette file must be installed
install -m 0644 src/AtlasPalette $RPM_BUILD_ROOT%{_datadir}/FlightGear

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING NEWS README
%{_bindir}/*
%{_datadir}/FlightGear/*

%changelog
* Tue Jan 06 2009 Fabrice Bellet <fabrice at bellet.info> 0.3.1-10
- new build fixes for newer SimGear

* Tue May 13 2008 Fabrice Bellet <fabrice at bellet.info> 0.3.1-9
- rebuild with newer plib

* Mon Feb  4 2008 Fabrice Bellet <fabrice at bellet.info> 0.3.1-8
- fix gcc43 build

* Mon Jan  7 2008 Fabrice Bellet <fabrice at bellet.info> 0.3.1-7
- rebuild with newer SimGear

* Sun Sep 23 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-6
- update License tag

* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.3.1-5
- Rebuild for selinux ppc32 issue.

* Wed Jun 27 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-4
- Rebuild with newer version of SimGear
- Add the missing Palette file to the package
- Remove the buildmaps.sh script (the functionnality provided
  by this script is now part of the Atlas program)

* Mon Apr  2 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-3
- Fixed duplicate BuildRequires

* Sun Apr  1 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-2
- Rebuild with new SimGear

* Tue Mar 20 2007 Fabrice Bellet <fabrice at bellet.info> 0.3.1-1
- Initial packaging


--- NEW FILE import.log ---
FlightGear-Atlas-0_3_1-10_fc11:HEAD:FlightGear-Atlas-0.3.1-10.fc11.src.rpm:1231349040


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 01:33:21 -0000	1.1
+++ .cvsignore	7 Jan 2009 17:24:49 -0000	1.2
@@ -0,0 +1,2 @@
+Atlas-0.3.1.tar.gz
+Atlas-default-maps.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 01:33:21 -0000	1.1
+++ sources	7 Jan 2009 17:24:49 -0000	1.2
@@ -0,0 +1,2 @@
+15bba54523a29928a14f17af449f960e  Atlas-0.3.1.tar.gz
+eacd2574d952eb79f0adde7827d6b2cf  Atlas-default-maps.tar.gz


