rpms/SimGear/devel SimGear-0.3.10-headers.patch, NONE, 1.1 SimGear-0.3.10-notabbed_value_test.patch, NONE, 1.1 SimGear-0.3.10-shared.patch, NONE, 1.1 SimGear.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tom Callaway (spot) fedora-extras-commits at redhat.com
Wed Mar 28 13:29:45 UTC 2007 

Author: spot

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

Modified Files:
	.cvsignore sources 
Added Files:
	SimGear-0.3.10-headers.patch 
	SimGear-0.3.10-notabbed_value_test.patch 
	SimGear-0.3.10-shared.patch SimGear.spec 
Log Message:
auto-import SimGear-0.3.10-3 on branch devel from SimGear-0.3.10-3.src.rpm

SimGear-0.3.10-headers.patch:

--- NEW FILE SimGear-0.3.10-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

SimGear-0.3.10-notabbed_value_test.patch:

--- NEW FILE SimGear-0.3.10-notabbed_value_test.patch ---
--- SimGear-0.3.10/simgear/misc/Makefile.am.BAD	2006-10-04 09:12:29.000000000 -0500
+++ SimGear-0.3.10/simgear/misc/Makefile.am	2006-10-04 09:12:43.000000000 -0500
@@ -24,7 +24,7 @@ libsgmisc_la_SOURCES = \
 
 libsgmisc_la_LDFLAGS = -version-info 1:0:0 -module
 
-noinst_PROGRAMS = tabbed_value_test swap_test
+noinst_PROGRAMS = swap_test
 
 tabbed_value_test_SOURCES = tabbed_values_test.cxx
 tabbed_value_test_LDFLAGS = \
--- SimGear-0.3.10/simgear/misc/Makefile.in.BAD	2006-10-04 09:09:48.000000000 -0500
+++ SimGear-0.3.10/simgear/misc/Makefile.in	2006-10-04 09:13:12.000000000 -0500
@@ -38,7 +38,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = tabbed_value_test$(EXEEXT) swap_test$(EXEEXT)
+noinst_PROGRAMS = swap_test$(EXEEXT)
 subdir = simgear/misc
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in

SimGear-0.3.10-shared.patch:

--- NEW FILE SimGear-0.3.10-shared.patch ---
--- SimGear-0.3.10/simgear/io/Makefile.am.orig	2006-10-03 14:59:53.000000000 -0500
+++ SimGear-0.3.10/simgear/io/Makefile.am	2006-10-03 15:00:18.000000000 -0500
@@ -1,6 +1,6 @@
 includedir = @includedir@/io
 
-lib_LIBRARIES = libsgio.a
+lib_LTLIBRARIES = libsgio.la
 
 include_HEADERS = \
 	iochannel.hxx \
@@ -11,7 +11,7 @@ include_HEADERS = \
 	sg_socket.hxx \
 	sg_socket_udp.hxx
 
-libsgio_a_SOURCES = \
+libsgio_la_SOURCES = \
 	iochannel.cxx \
 	lowlevel.cxx \
 	sg_binobj.cxx \
@@ -22,6 +22,8 @@ libsgio_a_SOURCES = \
 
 INCLUDES = -I$(top_srcdir)
 
+libsgio_la_LDFLAGS = -version-info 1:0:0 -module
+
 noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
--- SimGear-0.3.10/simgear/route/Makefile.am.orig	2006-10-03 15:07:01.000000000 -0500
+++ SimGear-0.3.10/simgear/route/Makefile.am	2006-10-03 15:07:18.000000000 -0500
@@ -1,13 +1,15 @@
 includedir = @includedir@/route
 
-lib_LIBRARIES = libsgroute.a
+lib_LTLIBRARIES = libsgroute.la
 
 include_HEADERS = route.hxx waypoint.hxx
 
-libsgroute_a_SOURCES = \
+libsgroute_la_SOURCES = \
 	route.cxx \
 	waypoint.cxx
 
+libsgroute_la_LDFLAGS = -version-info 1:0:0 -module
+
 INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = waytest routetest
--- SimGear-0.3.10/simgear/debug/Makefile.am.orig	2006-10-03 14:56:59.000000000 -0500
+++ SimGear-0.3.10/simgear/debug/Makefile.am	2006-10-03 14:57:45.000000000 -0500
@@ -2,10 +2,11 @@ includedir = @includedir@/debug
 
 EXTRA_DIST = logtest.cxx
 
-lib_LIBRARIES = libsgdebug.a
+lib_LTLIBRARIES = libsgdebug.la
 
 include_HEADERS = debug_types.h logstream.hxx
 
-libsgdebug_a_SOURCES = logstream.cxx
+libsgdebug_la_SOURCES = logstream.cxx
+libsgdebug_la_LDFLAGS = -version-info 1:0:0 -module
 
 INCLUDES = -I$(top_srcdir)
--- SimGear-0.3.10/simgear/scene/model/Makefile.am.orig	2006-10-03 15:08:25.000000000 -0500
+++ SimGear-0.3.10/simgear/scene/model/Makefile.am	2006-10-03 15:08:54.000000000 -0500
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/model
 
-lib_LIBRARIES = libsgmodel.a
+lib_LTLIBRARIES = libsgmodel.la
 
 noinst_HEADERS =
 
@@ -15,7 +15,7 @@ include_HEADERS = \
 	placementtrans.hxx \
 	shadowvolume.hxx
 
-libsgmodel_a_SOURCES = \
+libsgmodel_la_SOURCES = \
 	animation.cxx \
 	custtrans.cxx \
 	location.cxx \
@@ -27,4 +27,6 @@ libsgmodel_a_SOURCES = \
 	shadowvolume.cxx \
 	shadanim.cxx
 
+libsgmodel_la_LDFLAGS = -version-info 1:0:0 -module
+
 INCLUDES = -I$(top_srcdir)
--- SimGear-0.3.10/simgear/scene/sky/Makefile.am.orig	2006-10-03 15:09:07.000000000 -0500
+++ SimGear-0.3.10/simgear/scene/sky/Makefile.am	2006-10-03 15:09:43.000000000 -0500
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/sky
 
-lib_LIBRARIES = libsgsky.a
+lib_LTLIBRARIES = libsgsky.la
 
 include_HEADERS = \
 	cloud.hxx \
@@ -14,7 +14,7 @@ include_HEADERS = \
 	cloudfield.hxx \
 	newcloud.hxx
 
-libsgsky_a_SOURCES = \
+libsgsky_la_SOURCES = \
 	cloud.cxx \
 	dome.cxx \
 	moon.cxx \
@@ -26,4 +26,6 @@ libsgsky_a_SOURCES = \
 	cloudfield.cxx \
 	newcloud.cxx
 
+libsgsky_la_LDFLAGS = -version-info 1:0:0 -module
+
 INCLUDES = -I$(top_srcdir)
--- SimGear-0.3.10/simgear/scene/tgdb/Makefile.am.orig	2006-10-03 15:09:54.000000000 -0500
+++ SimGear-0.3.10/simgear/scene/tgdb/Makefile.am	2006-10-03 15:10:30.000000000 -0500
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/tgdb
 
-lib_LIBRARIES = libsgtgdb.a
+lib_LTLIBRARIES = libsgtgdb.la
 
 noinst_HEADERS =
 
@@ -12,11 +12,13 @@ include_HEADERS = \
 	userdata.hxx \
 	vasi.hxx
 
-libsgtgdb_a_SOURCES = \
+libsgtgdb_la_SOURCES = \
 	apt_signs.cxx \
 	leaf.cxx \
 	obj.cxx \
 	pt_lights.cxx \
 	userdata.cxx
 
+libsgtgdb_la_LDFLAGS = -version-info 1:0:0 -module
+
 INCLUDES = -I$(top_srcdir)
--- SimGear-0.3.10/simgear/scene/material/Makefile.am.orig	2006-10-03 15:07:46.000000000 -0500
+++ SimGear-0.3.10/simgear/scene/material/Makefile.am	2006-10-03 15:08:16.000000000 -0500
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/material
 
-lib_LIBRARIES = libsgmaterial.a
+lib_LTLIBRARIES = libsgmaterial.la
 
 noinst_HEADERS =
 
@@ -9,9 +9,11 @@ include_HEADERS = \
 	matlib.hxx \
 	matmodel.hxx
 
-libsgmaterial_a_SOURCES = \
+libsgmaterial_la_SOURCES = \
 	mat.cxx \
 	matlib.cxx \
 	matmodel.cxx
 
+libsgmaterial_la_LDFLAGS = -version-info 1:0:0 -module
+
 INCLUDES = -I$(top_srcdir)
--- SimGear-0.3.10/simgear/props/Makefile.am.orig	2006-10-03 15:05:26.000000000 -0500
+++ SimGear-0.3.10/simgear/props/Makefile.am	2006-10-03 15:06:48.000000000 -0500
@@ -1,17 +1,19 @@
 includedir = @includedir@/props
 
-lib_LIBRARIES = libsgprops.a
+lib_LTLIBRARIES = libsgprops.la
 
 include_HEADERS = \
 	condition.hxx \
 	props.hxx \
 	props_io.hxx
 
-libsgprops_a_SOURCES = \
+libsgprops_la_SOURCES = \
 	condition.cxx \
 	props.cxx \
 	props_io.cxx
 
+libsgprops_la_LDFLAGS = -version-info 1:0:0 -module
+
 noinst_PROGRAMS = props_test
 
 props_test_SOURCES = props_test.cxx
--- SimGear-0.3.10/simgear/math/Makefile.am.orig	2006-10-03 15:02:05.000000000 -0500
+++ SimGear-0.3.10/simgear/math/Makefile.am	2006-10-03 15:02:59.000000000 -0500
@@ -8,7 +8,7 @@ SGMathTest_SOURCES = SGMathTest.cxx
 SGMathTest_LDADD = libsgmath.a $(base_LIBS)
 
 
-lib_LIBRARIES = libsgmath.a
+lib_LTLIBRARIES = libsgmath.la
 
 include_HEADERS = \
 	interpolater.hxx \
[...76623 lines suppressed...]
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a $(am__DEPENDENCIES_1)
+waytest_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -222,20 +215,27 @@ libsgroute_la_SOURCES = \
 libsgroute_la_LDFLAGS = -version-info 1:0:0 -module
 INCLUDES = -I$(top_srcdir)
 waytest_SOURCES = waytest.cxx
-waytest_LDADD = \
-	$(top_builddir)/simgear/route/libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+waytest_LDFLAGS = \
+	$(top_builddir)/simgear/route/libsgroute.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
 	$(base_LIBS) \
 	-lz
 
 routetest_SOURCES = routetest.cxx
-routetest_LDADD = \
-	$(top_builddir)/simgear/route/libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(base_LIBS)
+routetest_LDFLAGS = \
+	$(top_builddir)/simgear/route/libsgroute.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(base_LIBS) -lz
 
 all: all-am
 
diff -urp SimGear-0.3.10.SHARED/simgear/screen/Makefile.in SimGear-0.3.10/simgear/screen/Makefile.in
--- SimGear-0.3.10.SHARED/simgear/screen/Makefile.in	2006-10-04 08:56:56.000000000 -0500
+++ SimGear-0.3.10/simgear/screen/Makefile.in	2006-10-04 08:57:48.000000000 -0500
@@ -72,11 +72,7 @@ am__TestRenderTexture_SOURCES_DIST = Tes
 @HAVE_GLUT_TRUE at am_TestRenderTexture_OBJECTS =  \
 @HAVE_GLUT_TRUE@	TestRenderTexture.$(OBJEXT)
 TestRenderTexture_OBJECTS = $(am_TestRenderTexture_OBJECTS)
-am__DEPENDENCIES_1 =
- at HAVE_GLUT_TRUE@TestRenderTexture_DEPENDENCIES =  \
- at HAVE_GLUT_TRUE@	$(top_builddir)/simgear/screen/libsgscreen.a \
- at HAVE_GLUT_TRUE@	$(top_builddir)/simgear/debug/libsgdebug.a \
- at HAVE_GLUT_TRUE@	$(am__DEPENDENCIES_1)
+TestRenderTexture_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -253,10 +249,10 @@ libsgscreen_la_SOURCES = \
 
 libsgscreen_la_LDFLAGS = -version-info 1:0:0 -module
 @HAVE_GLUT_TRUE at TestRenderTexture_SOURCES = TestRenderTexture.cpp
- at HAVE_GLUT_TRUE@TestRenderTexture_LDADD = \
- at HAVE_GLUT_TRUE@	$(top_builddir)/simgear/screen/libsgscreen.a \
- at HAVE_GLUT_TRUE@	$(top_builddir)/simgear/debug/libsgdebug.a \
- at HAVE_GLUT_TRUE@	$(opengl_LIBS)
+ at HAVE_GLUT_TRUE@TestRenderTexture_LDFLAGS = \
+ at HAVE_GLUT_TRUE@	$(top_builddir)/simgear/screen/libsgscreen.la \
+ at HAVE_GLUT_TRUE@	$(top_builddir)/simgear/debug/libsgdebug.la \
+ at HAVE_GLUT_TRUE@	$(opengl_LIBS) -lz -lplibssg
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
 all: all-am
diff -urp SimGear-0.3.10.SHARED/simgear/serial/Makefile.in SimGear-0.3.10/simgear/serial/Makefile.in
--- SimGear-0.3.10.SHARED/simgear/serial/Makefile.in	2006-10-04 08:56:56.000000000 -0500
+++ SimGear-0.3.10/simgear/serial/Makefile.in	2006-10-04 08:57:49.000000000 -0500
@@ -65,9 +65,7 @@ libsgserial_la_OBJECTS = $(am_libsgseria
 PROGRAMS = $(noinst_PROGRAMS)
 am_testserial_OBJECTS = testserial.$(OBJEXT)
 testserial_OBJECTS = $(am_testserial_OBJECTS)
-testserial_DEPENDENCIES =  \
-	$(top_builddir)/simgear/serial/libsgserial.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+testserial_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -208,9 +206,9 @@ include_HEADERS = serial.hxx
 libsgserial_la_SOURCES = serial.cxx
 libsgserial_la_LDFLAGS = -version-info 1:0:0 -module
 testserial_SOURCES = testserial.cxx
-testserial_LDADD = \
-	$(top_builddir)/simgear/serial/libsgserial.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+testserial_LDFLAGS = \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 INCLUDES = -I$(top_srcdir)
 all: all-am
diff -urp SimGear-0.3.10.SHARED/simgear/sound/Makefile.in SimGear-0.3.10/simgear/sound/Makefile.in
--- SimGear-0.3.10.SHARED/simgear/sound/Makefile.in	2006-10-04 08:56:56.000000000 -0500
+++ SimGear-0.3.10/simgear/sound/Makefile.in	2006-10-04 08:57:49.000000000 -0500
@@ -66,18 +66,10 @@ libsgsound_la_OBJECTS = $(am_libsgsound_
 PROGRAMS = $(noinst_PROGRAMS)
 am_openal_test1_OBJECTS = openal_test1.$(OBJEXT)
 openal_test1_OBJECTS = $(am_openal_test1_OBJECTS)
-am__DEPENDENCIES_1 =
-openal_test1_DEPENDENCIES =  \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(am__DEPENDENCIES_1)
+openal_test1_LDADD = $(LDADD)
 am_openal_test2_OBJECTS = openal_test2.$(OBJEXT)
 openal_test2_OBJECTS = $(am_openal_test2_OBJECTS)
-openal_test2_DEPENDENCIES =  \
-	$(top_builddir)/simgear/sound/libsgsound.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
-	$(am__DEPENDENCIES_1)
+openal_test2_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/simgear
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -231,16 +223,18 @@ libsgsound_la_SOURCES = \
 libsgsound_la_LDFLAGS = -version-info 1:0:0 -module
 openal_test1_SOURCES = openal_test1.cxx
 openal_test2_SOURCES = openal_test2.cxx
-openal_test1_LDADD = \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
+openal_test1_LDFLAGS = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(openal_LIBS)
 
-openal_test2_LDADD = \
-	$(top_builddir)/simgear/sound/libsgsound.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
-	$(openal_LIBS)
+openal_test2_LDFLAGS = \
+	$(top_builddir)/simgear/sound/libsgsound.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(openal_LIBS) -lz
 
 INCLUDES = -I$(top_srcdir)
 all: all-am
--- SimGear-0.3.10/simgear/Makefile.am.BAD	2006-10-04 09:01:57.000000000 -0500
+++ SimGear-0.3.10/simgear/Makefile.am	2006-10-04 09:02:11.000000000 -0500
@@ -17,8 +17,8 @@ SUBDIRS = \
 	xml \
 	debug \
 	structure \
-	props \
 	misc \
+	props \
 	bucket \
 	ephemeris \
 	serial \
--- SimGear-0.3.10/simgear/screen/Makefile.am.BAD	2006-10-04 09:07:55.000000000 -0500
+++ SimGear-0.3.10/simgear/screen/Makefile.am	2006-10-04 09:08:12.000000000 -0500
@@ -45,7 +45,7 @@ TestRenderTexture_SOURCES = TestRenderTe
 TestRenderTexture_LDFLAGS = \
 	$(top_builddir)/simgear/screen/libsgscreen.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(opengl_LIBS) -lz -lplibssg
+	$(opengl_LIBS) -lz -lplibssg -ljpeg
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
--- SimGear-0.3.10/simgear/screen/Makefile.in.BAD	2006-10-04 09:08:30.000000000 -0500
+++ SimGear-0.3.10/simgear/screen/Makefile.in	2006-10-04 09:08:37.000000000 -0500
@@ -252,7 +252,7 @@ libsgscreen_la_LDFLAGS = -version-info 1
 @HAVE_GLUT_TRUE at TestRenderTexture_LDFLAGS = \
 @HAVE_GLUT_TRUE@	$(top_builddir)/simgear/screen/libsgscreen.la \
 @HAVE_GLUT_TRUE@	$(top_builddir)/simgear/debug/libsgdebug.la \
- at HAVE_GLUT_TRUE@	$(opengl_LIBS) -lz -lplibssg
+ at HAVE_GLUT_TRUE@	$(opengl_LIBS) -lz -lplibssg -ljpeg
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
 all: all-am
--- SimGear-0.3.10/simgear/Makefile.in.BAD	2006-10-04 09:02:22.000000000 -0500
+++ SimGear-0.3.10/simgear/Makefile.in	2006-10-04 09:02:36.000000000 -0500
@@ -199,8 +199,8 @@ SUBDIRS = \
 	xml \
 	debug \
 	structure \
-	props \
 	misc \
+	props \
 	bucket \
 	ephemeris \
 	serial \


--- NEW FILE SimGear.spec ---
Name:		SimGear
Version:	0.3.10
Release:	3%{?dist}
License:	GPL
Group:		System Environment/Libraries
Summary:	Simulation library components
URL:		http://www.simgear.org
Source0:	ftp://ftp.simgear.org/pub/simgear/Source/SimGear-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		SimGear-0.3.10-shared.patch
Patch1:		SimGear-0.3.10-notabbed_value_test.patch
Patch2:		SimGear-0.3.10-headers.patch
BuildRequires:	openal-devel, plib-devel, libXt-devel, libXext-devel
BuildRequires:	libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
BuildRequires:	zlib-devel, libjpeg-devel

%description
SimGear is a set of open-source libraries designed to be used as building
blocks for quickly assembling 3d simulations, games, and visualization
applications.

%package devel
Group: Development/Libraries
Summary: Development libraries and headers for SimGear
Requires: %{name} = %{version}-%{release}
Requires: plib-devel, libjpeg-devel, zlib-devel, libGL-devel
Requires: freealut-devel, libX11-devel

%description devel
Development headers and libraries for building applications against 
SimGear.

%prep
%setup -q
%patch0 -p1
# Have to disable the tabbed_value_test, because otherwise
# we get caught in a loop between libsgprops and libsgmisc.
%patch1 -p1

%build
%configure --with-jpeg-factory --disable-static
# This application doesn't build with smp_mflags. :/
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Don't really need the .la files.
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la

# These two headers have a useless conditional when they're not internal.
# This cleans them up.
cd $RPM_BUILD_ROOT%{_includedir}/simgear/
patch -p0 < %{PATCH2}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS NEWS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/simgear/
%{_libdir}/*.so

%changelog
* Wed Oct 18 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.10-3
- patch out the config internal header calls (not packaged)
- use generic libGL-devel Requires

* Tue Oct  3 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.10-2
- patch in some shared libraries

* Fri Sep 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.10-1
- bump to 0.3.10, fix BuildRequires

* Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.8-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Feb 2007 12:45:12 -0000	1.1
+++ .cvsignore	28 Mar 2007 13:29:12 -0000	1.2
@@ -0,0 +1 @@
+SimGear-0.3.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Feb 2007 12:45:12 -0000	1.1
+++ sources	28 Mar 2007 13:29:12 -0000	1.2
@@ -0,0 +1 @@
+469e17b08ed4267a33dbd19eabdd976b  SimGear-0.3.10.tar.gz

More information about the scm-commits mailing list