rpms/SimGear/F-12 SimGear-1.9.1-shared.patch, 1.1, 1.2 SimGear.spec, 1.21, 1.22

[Fabrice Bellet]

Author: bellet

Update of /cvs/extras/rpms/SimGear/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5103

Modified Files:
	SimGear-1.9.1-shared.patch SimGear.spec 
Log Message:
* Sun Nov 29 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-9
- Fix osgParticle dependency (bz#542132)


SimGear-1.9.1-shared.patch:
 configure.ac                        |    1 
 simgear/Makefile.am                 |   14 +++--
 simgear/bucket/Makefile.am          |    5 +-
 simgear/debug/Makefile.am           |    5 +-
 simgear/environment/Makefile.am     |   12 ++++
 simgear/ephemeris/Makefile.am       |   10 +++-
 simgear/io/Makefile.am              |   87 +++++++++++++++++++++++-------------
 simgear/magvar/Makefile.am          |   10 ++--
 simgear/math/Makefile.am            |   23 +++++++--
 simgear/misc/Makefile.am            |   28 ++++++-----
 simgear/nasal/Makefile.am           |   14 +++--
 simgear/props/Makefile.am           |   23 ++++++---
 simgear/route/.Makefile.am.orig.swp |binary
 simgear/route/.Makefile.am.rej.swp  |binary
 simgear/route/Makefile.am           |   40 +++++++++-------
 simgear/scene/material/Makefile.am  |   12 ++++
 simgear/scene/model/Makefile.am     |   14 ++++-
 simgear/scene/sky/Makefile.am       |   15 +++++-
 simgear/scene/tgdb/Makefile.am      |   14 ++++-
 simgear/scene/util/Makefile.am      |    6 +-
 simgear/screen/Makefile.am          |   18 ++++---
 simgear/serial/Makefile.am          |   14 +++--
 simgear/sound/Makefile.am           |   26 +++++++---
 simgear/structure/Makefile.am       |    9 ++-
 simgear/structure/Makefile.am.orig  |   34 ++++++++++++++
 simgear/structure/Makefile.am.rej   |   17 +++++++
 simgear/threads/Makefile.am         |    6 +-
 simgear/timing/Makefile.am          |   10 +++-
 simgear/xml/Makefile.am             |    9 ++-
 29 files changed, 344 insertions(+), 132 deletions(-)

Index: SimGear-1.9.1-shared.patch
===================================================================
RCS file: /cvs/extras/rpms/SimGear/F-12/SimGear-1.9.1-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- SimGear-1.9.1-shared.patch	6 Feb 2009 09:46:40 -0000	1.1
+++ SimGear-1.9.1-shared.patch	30 Nov 2009 09:56:29 -0000	1.2
@@ -560,7 +560,7 @@ diff -uNrp SimGear-1.9.1.orig/simgear/sc
  INCLUDES = -I$(top_srcdir)
 diff -uNrp SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am
 --- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am	2009-01-25 13:00:32.000000000 +0100
-+++ SimGear-1.9.1/simgear/scene/model/Makefile.am	2009-02-03 22:37:33.000000000 +0100
++++ SimGear-1.9.1/simgear/scene/model/Makefile.am	2009-11-29 18:29:23.000000000 +0100
 @@ -1,6 +1,6 @@
  includedir = @includedir@/scene/model
  
@@ -582,7 +582,7 @@ diff -uNrp SimGear-1.9.1.orig/simgear/sc
  	SGScaleTransform.cxx \
  	SGTranslateTransform.cxx
  
-+libsgmodel_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibsg -lGL
++libsgmodel_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibsg -losgParticle -lGL
 +
 +libsgmodel_la_LIBADD = \
 +	$(top_builddir)/simgear/debug/libsgdebug.la \


Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/F-12/SimGear.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- SimGear.spec	16 Aug 2009 09:16:55 -0000	1.21
+++ SimGear.spec	30 Nov 2009 09:56:29 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		SimGear
 Version:	1.9.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
@@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsgxml.so
 
 %changelog
+* Sun Nov 29 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-9
+- Fix osgParticle dependency (bz#542132)
+
 * Sun Aug 16 2009 Fabrice Bellet <fabrice at bellet.info> 1.9.1-8
 - Switch to openal-soft