rpms/SimGear/devel SimGear.spec, 1.7, 1.8 SimGear-0.3.10-headers.patch, 1.1, NONE SimGear-0.3.10-shared-auto.patch, 1.1, NONE SimGear-0.3.10-shared.patch, 1.2, NONE SimGear-0.3.10-untangle.patch, 1.1, NONE SimGear-0.3.11-pre1-alpha.patch, 1.1, NONE SimGear-0.3.11pre1-buildmiscbeforeprops.patch, 1.1, NONE SimGear-0.3.11pre1-ppcfixes.patch, 1.1, NONE SimGear-0.3.11pre1-shared-auto.patch, 1.1, NONE SimGear-0.3.11pre1-shared.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	SimGear.spec 
Removed Files:
	SimGear-0.3.10-headers.patch SimGear-0.3.10-shared-auto.patch 
	SimGear-0.3.10-shared.patch SimGear-0.3.10-untangle.patch 
	SimGear-0.3.11-pre1-alpha.patch 
	SimGear-0.3.11pre1-buildmiscbeforeprops.patch 
	SimGear-0.3.11pre1-ppcfixes.patch 
	SimGear-0.3.11pre1-shared-auto.patch 
	SimGear-0.3.11pre1-shared.patch 
Log Message:
* 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



Index: SimGear.spec
===================================================================
RCS file: /cvs/extras/rpms/SimGear/devel/SimGear.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimGear.spec	3 Oct 2007 21:22:30 -0000	1.7
+++ SimGear.spec	6 Jan 2008 17:46:28 -0000	1.8
@@ -1,21 +1,19 @@
 Name:		SimGear
-Version:	0.3.11
-Release:	0.3.pre1%{?dist}.2
+Version:	1.0.0
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Libraries
 Summary:	Simulation library components
 URL:		http://www.simgear.org
-Source0:	ftp://ftp.simgear.org/pub/simgear/Source/SimGear-%{version}-pre1.tar.gz
+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.11pre1-shared.patch
+Patch0:		SimGear-1.0.0-shared.patch
 Patch1:		SimGear-0.3.10-notabbed_value_test.patch
 Patch2:		SimGear-0.3.10-headers.patch
-Patch3:		SimGear-0.3.11pre1-shared-auto.patch
+Patch3:		SimGear-1.0.0-shared-auto.patch
 Patch4:		SimGear-0.3.10-thesky.patch
-Patch5:		SimGear-0.3.10-untangle.patch
-Patch6:		SimGear-0.3.11pre1-buildmiscbeforeprops.patch
-Patch7:		SimGear-0.3.11pre1-ppcfixes.patch
-Patch8:		SimGear-0.3.11-pre1-alpha.patch
+Patch5:		SimGear-1.0.0-untangle.patch
+Patch7:		SimGear-1.0.0-more-archs.patch
 BuildRequires:	openal-devel, plib-devel, libXt-devel, libXext-devel
 BuildRequires:	libXi-devel, libXmu-devel, freeglut-devel, freealut-devel
 BuildRequires:	zlib-devel, libjpeg-devel
@@ -37,7 +35,7 @@
 SimGear.
 
 %prep
-%setup -q -n %{name}-%{version}-pre1
+%setup -q
 # automake / autoconf input file changes
 %patch0 -p1
 # automake / autoconf auto generated changes
@@ -49,17 +47,18 @@
 %patch4 -p1
 # Some circular dependcy fixing, see bz 208678
 %patch5 -p1
-# Build misc/ before props/
-%patch6 -p1
-# Fix ppc defines in conditional to be more complete.
+# Fix compiling on pcc and alpha
 %patch7 -p1
-# Enable alpha support
-%patch8 -p1
+chmod -x simgear/screen/GLBitmaps.cxx simgear/scene/model/*.?xx
 
 %build
 %configure --with-jpeg-factory --disable-static
+# We do not want -lm by default!
+sed -i 's/ -lm / /g' libtool
 # This application doesn't build with smp_mflags. :/
-make
+# The libs override are to avoid unnecessary linking with -lm
+make base_LIBS= openal_LIBS="-lalut -lopenal" \
+  opengl_LIBS="-lglut -lGLU -lGL -lXmu -lXt -lSM -lICE -lXi -lXext -lX11"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +81,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS NEWS
-%{_libdir}/lib*-%{version}-pre1.so
+%{_libdir}/lib*-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -111,6 +110,10 @@
 %{_libdir}/libsgxml.so
 
 %changelog
+* 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
+
 * Wed Oct 03 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.11-0.2.pre1.2
 - enable alpha (bz 303161)
 


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


--- SimGear-0.3.10-shared-auto.patch DELETED ---


--- SimGear-0.3.10-shared.patch DELETED ---


--- SimGear-0.3.10-untangle.patch DELETED ---


--- SimGear-0.3.11-pre1-alpha.patch DELETED ---


--- SimGear-0.3.11pre1-buildmiscbeforeprops.patch DELETED ---


--- SimGear-0.3.11pre1-ppcfixes.patch DELETED ---


--- SimGear-0.3.11pre1-shared-auto.patch DELETED ---


--- SimGear-0.3.11pre1-shared.patch DELETED ---