rpms/SimGear/devel SimGear-1.0.0-headers.patch, NONE, 1.1 SimGear.spec, 1.8, 1.9 SimGear-0.3.10-headers.patch, 1.3, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/SimGear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13884

Modified Files:
	SimGear.spec 
Added Files:
	SimGear-1.0.0-headers.patch 
Removed Files:
	SimGear-0.3.10-headers.patch 
Log Message:
* Mon Jan  7 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-2
- Fix timestamp.hxx to not require the (not installed) simgear_config.h header


SimGear-1.0.0-headers.patch:

--- NEW FILE SimGear-1.0.0-headers.patch ---
--- math/sg_memory.h.BAD	2006-10-18 14:55:31.000000000 -0500
+++ math/sg_memory.h	2006-10-18 14:55:52.000000000 -0500
@@ -24,10 +24,6 @@
 #ifndef _SG_MEMORY_H
 #define _SG_MEMORY_H
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
 #ifdef HAVE_MEMCPY
 
 #  ifdef HAVE_MEMORY_H
--- misc/stopwatch.hxx.BAD	2006-10-18 14:57:56.000000000 -0500
+++ misc/stopwatch.hxx	2006-10-18 14:58:06.000000000 -0500
@@ -42,10 +42,6 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
-
 #if defined(__linux__) && ! defined(HAVE_GETRUSAGE)
 #  define HAVE_GETRUSAGE
 #endif
--- structure/SGSmplhist.hxx.BAD	2008-01-07 21:44:55.000000000 +0100
+++ structure/SGSmplhist.hxx	2008-01-07 21:46:29.000000000 +0100
@@ -16,9 +16,6 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#include <simgear_config.h>
-#endif
 #ifndef SampleHistogram_h
 #ifdef __GNUG__
 #pragma interface
--- timing/timestamp.hxx.BAD	2008-01-07 11:03:49.000000000 +0100
+++ timing/timestamp.hxx	2008-01-07 21:47:15.000000000 +0100
@@ -32,9 +32,8 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <simgear_config.h>
-#endif
+#define HAVE_GETTIMEOFDAY 1
+#define HAVE_SYS_TIME_H 1
 
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>


Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/SimGear.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimGear.spec	6 Jan 2008 17:46:28 -0000	1.8
+++ SimGear.spec	7 Jan 2008 21:39:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		SimGear
 Version:	1.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
@@ -9,7 +9,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		SimGear-1.0.0-shared.patch
 Patch1:		SimGear-0.3.10-notabbed_value_test.patch
-Patch2:		SimGear-0.3.10-headers.patch
+Patch2:		SimGear-1.0.0-headers.patch
 Patch3:		SimGear-1.0.0-shared-auto.patch
 Patch4:		SimGear-0.3.10-thesky.patch
 Patch5:		SimGear-1.0.0-untangle.patch
@@ -110,6 +110,9 @@
 %{_libdir}/libsgxml.so
 
 %changelog
+* Mon Jan  7 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-2
+- Fix timestamp.hxx to not require the (not installed) simgear_config.h header
+
 * Sun Jan  6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.0-1
 - Update to new upstream release 1.0.0
 - Port various patches to 1.0.0


--- SimGear-0.3.10-headers.patch DELETED ---