rpms/FlightGear-Atlas/devel FlightGear-Atlas-0.4.0-build-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 FlightGear-Atlas.spec, 1.4, 1.5 sources, 1.2, 1.3 FlightGear-Atlas-0.3.1-build-fixes.patch, 1.1, NONE

Sat Feb 27 11:20:22 UTC 2010

Author: bellet

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

Modified Files:
	.cvsignore FlightGear-Atlas.spec sources 
Added Files:
	FlightGear-Atlas-0.4.0-build-fixes.patch 
Removed Files:
	FlightGear-Atlas-0.3.1-build-fixes.patch 
Log Message:
* Fri Feb 26 2010 Fabrice Bellet <fabrice at bellet.info> 0.4.0-0.3.20100226
- Prepare for release 0.4.0


FlightGear-Atlas-0.4.0-build-fixes.patch:
 Atlas.cxx       |    7 ++++---
 Cache.cxx       |    2 +-
 Preferences.hxx |    1 +
 Tiles.cxx       |    6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE FlightGear-Atlas-0.4.0-build-fixes.patch ---
diff -uNr Atlas.orig/src/Atlas.cxx Atlas/src/Atlas.cxx
--- Atlas.orig/src/Atlas.cxx	2010-01-31 23:59:54.000000000 +0100
+++ Atlas/src/Atlas.cxx	2010-02-01 00:20:40.893487931 +0100
@@ -31,6 +31,7 @@
 #include <plib/fnt.h>
 #include <plib/pu.h>
 #include <plib/puAux.h>
+#include <plib/sg.h>
 #include <string>
 
 #include <cassert>
@@ -2877,10 +2878,10 @@
 	    sgdVec3 axis;
 	    sgdMat4 rot;
 
-	    sgdVectorProductVec3(axis, newC.sg(), oldC.sg());
+	    sgdVectorProductVec3(axis, newC.data(), oldC.data());
 	    double theta = SGD_RADIANS_TO_DEGREES *
 		atan2(sgdLengthVec3(axis), 
-		      sgdScalarProductVec3(oldC.sg(), newC.sg()));
+		      sgdScalarProductVec3(oldC.data(), newC.data()));
 	    sgdMakeRotMat4(rot, theta, axis);
 	    
 	    // Transform the eye point and the camera up vector.
@@ -2991,7 +2992,7 @@
 	  case 'c': 
 	    // Center the map on the current mouse position.
 	    if (cursor.validLocation) {
-		movePosition(cursor.cart.sg());
+		movePosition(cursor.cart.data());
 	    }
 	    break;
 
diff -uNr Atlas.orig/src/Cache.cxx Atlas/src/Cache.cxx
--- Atlas.orig/src/Cache.cxx	2009-07-16 18:39:42.000000000 +0200
+++ Atlas/src/Cache.cxx	2010-02-01 00:40:33.668736899 +0100
@@ -225,7 +225,7 @@
 	_objectsSize += c->size();
 
 	t2.stamp();
-    } while ((_toBeLoaded.size() > 0) && ((t2 - t1) < microSeconds));
+    } while ((_toBeLoaded.size() > 0) && ((t2 - t1).toUSecs() < microSeconds));
 
     // Return to the old window.
     glutPostWindowRedisplay(_window);
diff -uNr Atlas.orig/src/Preferences.hxx Atlas/src/Preferences.hxx
--- Atlas.orig/src/Preferences.hxx	2010-01-31 23:59:56.000000000 +0100
+++ Atlas/src/Preferences.hxx	2010-02-01 00:31:25.057738889 +0100
@@ -28,6 +28,7 @@
 
 #include <vector>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/math/SGMath.hxx>
 
 // This class (of which there should only be one instantiated), keeps
 // Atlas' preferences.  Preferences come from 3 places:
diff -uNr Atlas.orig/src/Tiles.cxx Atlas/src/Tiles.cxx
--- Atlas.orig/src/Tiles.cxx	2009-09-09 06:00:42.000000000 +0200
+++ Atlas/src/Tiles.cxx	2010-02-01 00:28:46.445486635 +0100
@@ -23,8 +23,14 @@
 
 #include <cassert>
 #include <stdexcept>
+#include <cstdlib>
+#include <math.h>
 
 #include <simgear/misc/sg_path.hxx>
+#include <plib/fnt.h>
+#include <plib/pu.h>
+#include <plib/puAux.h>
+#include <plib/sg.h>
 
 #include "Tiles.hxx"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	7 Jan 2009 17:24:49 -0000	1.2
+++ .cvsignore	27 Feb 2010 11:20:22 -0000	1.3
@@ -1,2 +1,2 @@
-Atlas-0.3.1.tar.gz
-Atlas-default-maps.tar.gz
+Atlas-cvs20100226.tar.gz
+Atlas-0.4.0-default-maps.tar.gz


Index: FlightGear-Atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/FlightGear-Atlas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- FlightGear-Atlas.spec	24 Jul 2009 15:09:54 -0000	1.4
+++ FlightGear-Atlas.spec	27 Feb 2010 11:20:22 -0000	1.5
@@ -1,17 +1,19 @@
+%define cvsdate 20100226
 Name:		FlightGear-Atlas
 Summary:	Flightgear map tools
-Version:	0.3.1
-Release:	13%{?dist}
+Version:	0.4.0
+Release:	0.3.cvs%{cvsdate}%{?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
+Source0:	Atlas-cvs%{cvsdate}.tar.gz
+Source1:	Atlas-0.4.0-default-maps.tar.gz
+Patch0:		FlightGear-Atlas-0.4.0-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
+BuildRequires:	automake autoconf intltool libtool
 Requires:	FlightGear-data
 Obsoletes:	fgfs-Atlas < 0.3.1-10
 
@@ -22,12 +24,14 @@ through two main parts: The map creator 
 Atlas viewer
 
 %prep
-%setup -q -n Atlas-%{version}
+%setup -q -n Atlas
 %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
+./autogen.sh
+%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DGL_GLEXT_PROTOTYPES" \
+	--with-fgbase=%{_datadir}/FlightGear
 make %{?_smp_mflags}
 
 %install
@@ -36,12 +40,16 @@ 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
+install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Palettes
+install -d $RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Fonts
+
+install -m 0644 src/data/Fonts/*.txf \
+	$RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Fonts
+install -m 0644 src/data/Palettes/*.ap \
+	$RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Palettes
+install -m 0644 src/data/background.jpg \
+	$RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,9 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/*
-%{_datadir}/FlightGear/*
+%{_datadir}/FlightGear/Atlas
 
 %changelog
+* Fri Feb 26 2010 Fabrice Bellet <fabrice at bellet.info> 0.4.0-0.3.20100226
+- Prepare for release 0.4.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	7 Jan 2009 17:24:49 -0000	1.2
+++ sources	27 Feb 2010 11:20:22 -0000	1.3
@@ -1,2 +1,2 @@
-15bba54523a29928a14f17af449f960e  Atlas-0.3.1.tar.gz
-eacd2574d952eb79f0adde7827d6b2cf  Atlas-default-maps.tar.gz
+75c593986761431ab166fa67a18fd702  Atlas-cvs20100226.tar.gz
+ad39040ecb18627f695d4a3c852db81b  Atlas-0.4.0-default-maps.tar.gz


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

