Mercurial Mercurial > upstream > spec-files-extra / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SFEsimgear.spec: bump to 2.10.0 spec-files-extra
authorkenmays
Mon, 25 Feb 2013 17:34:36 +0000
branchspec-files-extra
changeset 10621 994613f7954b
parent 10620 f2d34b7f1bec
child 10622 1872fe2d4c83
SFEsimgear.spec: bump to 2.10.0
trunk/ChangeLog file | annotate | diff | comparison | revisions
trunk/SFEsimgear.spec file | annotate | diff | comparison | revisions
trunk/patches/simgear-01-stdlib.diff file | annotate | diff | comparison | revisions
trunk/patches/simgear-02-isnan.diff file | annotate | diff | comparison | revisions 
--- a/trunk/ChangeLog	Mon Feb 25 14:09:48 2013 +0000
+++ b/trunk/ChangeLog	Mon Feb 25 17:34:36 2013 +0000
@@ -1,6 +1,9 @@
 2013-02-25 Ken Mays <[email protected]>
 
 	* SFEdovecot.spec: bump to 2.1.15
+	* SFEsimgear.spec: bump to 2.10.0 
+	* patches/simgear-01-stdlib.diff
+	* patches/simgear-02-isnan.diff
 
 2013-02-24  Logan O'Sullivan Bruns  <[email protected]>
 
--- a/trunk/SFEsimgear.spec	Mon Feb 25 14:09:48 2013 +0000
+++ b/trunk/SFEsimgear.spec	Mon Feb 25 17:34:36 2013 +0000
@@ -15,7 +15,7 @@
 Name:		SFEsimgear
 IPS_Package_Name:	library/simgear
 Summary:	Simulator Construction Tools
-Version:	2.8.0
+Version:	2.10.0
 Source:		%{src_url}/%{src_name}-%{version}.tar.bz2
 Patch1:		simgear-01-stdlib.diff
 Patch2:		simgear-02-isnan.diff
@@ -41,8 +41,8 @@
 
 %prep
 %setup -q -n %{src_name}-%{version}
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -77,6 +77,8 @@
 %{_includedir}
 
 %changelog
+* Mon Feb 25 2013 - Ken Mays <[email protected]>
+- bump to 2.10.0
 * Thu Aug 30 2012 - Ken Mays <[email protected]>
 - bump to 2.8.0
 * Sat Jun 23 2012 - Thomas Wagner
--- a/trunk/patches/simgear-01-stdlib.diff	Mon Feb 25 14:09:48 2013 +0000
+++ b/trunk/patches/simgear-01-stdlib.diff	Mon Feb 25 17:34:36 2013 +0000
@@ -1,15 +1,15 @@
---- simgear-2.6.0/simgear/misc/sg_dir.cxx	2012-02-17 23:38:44.501895075 +0100
-+++ simgear-2.6.0/simgear/misc/sg_dir.cxx	2012-03-03 20:50:02.255569508 +0100
-@@ -39,6 +39,7 @@
+--- simgear-2.10.0/simgear/misc/sg_dir.cxx.orig	2013-02-18 14:58:14.000000000 +0000
++++ simgear-2.10.0/simgear/misc/sg_dir.cxx	2013-02-25 17:26:06.224950313 +0000
+@@ -41,6 +41,7 @@
  #include <simgear/debug/logstream.hxx>
  #include <boost/foreach.hpp>
  
 +#include <cstdlib>
  #include <cstring>
+ #include <cstdlib>
  #include <iostream>
- 
---- simgear-2.6.0/simgear/props/condition.cxx	Sun Mar  4 11:00:39 2012
-+++ simgear-2.6.0/simgear/props/condition.cxx	Sun Mar  4 11:01:03 2012
+--- simgear-2.10.0/simgear/props/condition.cxx.orig	2013-02-25 17:24:58.437051448 +0000
++++ simgear-2.10.0/simgear/props/condition.cxx	2013-02-25 17:26:06.227381844 +0000
 @@ -12,6 +12,7 @@
  #endif
  
@@ -18,13 +18,13 @@
  
  #include <simgear/structure/exception.hxx>
  
---- simgear-2.6.0/simgear/props/propertyObject_test.cxx	Sun Mar  4 11:41:02 2012
-+++ simgear-2.6.0/simgear/props/propertyObject_test.cxx	Sun Mar  4 11:41:20 2012
-@@ -13,6 +13,7 @@
- #include <iostream>
+--- simgear-2.10.0/simgear/props/propertyObject_test.cxx.orig	2013-02-18 14:58:14.000000000 +0000
++++ simgear-2.10.0/simgear/props/propertyObject_test.cxx	2013-02-25 17:26:06.230896178 +0000
+@@ -14,6 +14,7 @@
  #include <cassert>
+ #include <cstdlib>
  #include <cstring>
 +#include <cstdlib>
  
- // working around MSVC weirdness with props.hxx and SGMathFwd
- #include <simgear/math/SGMath.hxx>
+ #include "propertyObject.hxx"
+ 
--- a/trunk/patches/simgear-02-isnan.diff	Mon Feb 25 14:09:48 2013 +0000
+++ b/trunk/patches/simgear-02-isnan.diff	Mon Feb 25 17:34:36 2013 +0000
@@ -1,6 +1,6 @@
---- simgear-2.6.0/simgear/scene/sky/cloud.cxx	Fri Feb 17 23:38:44 2012
-+++ simgear-2.6.0/simgear/scene/sky/cloud.cxx	Sun Mar  4 11:23:02 2012
-@@ -735,7 +735,7 @@
+--- simgear-2.10.0/simgear/scene/sky/cloud.cxx.orig	2013-02-25 17:06:56.819955193 +0000
++++ simgear-2.10.0/simgear/scene/sky/cloud.cxx	2013-02-25 17:09:45.211593555 +0000
+@@ -736,7 +736,7 @@
              // this happens, lets just use the last known good course.
              // This is a hack, and it would probably be better to make
              // calc_gc_course_dist() more robust.
@@ -9,19 +9,18 @@
                  course = last_course;
              } else {
                  last_course = course;
---- simgear-2.6.0/simgear/sound/sample_group.cxx	Fri Feb 17 23:38:44 2012
-+++ simgear-2.6.0/simgear/sound/sample_group.cxx	Sun Mar  4 11:31:46 2012
-@@ -23,7 +23,7 @@
- #ifdef HAVE_CONFIG_H
+--- simgear-2.10.0/simgear/sound/sample_group.cxx.orig	2013-02-25 17:07:44.104263632 +0000
++++ simgear-2.10.0/simgear/sound/sample_group.cxx	2013-02-25 17:13:02.394452967 +0000
+@@ -24,6 +24,7 @@
  #  include <simgear_config.h>
  #endif
--
+ 
 +#include <cmath>
+ #include <cassert>
  #include <simgear/compiler.h>
- 
- #include "soundmgr_openal.hxx"
-@@ -30,7 +30,7 @@
- #include "sample_group.hxx"
+ #include <simgear/sg_inlines.h>
+@@ -36,7 +37,7 @@
+ using std::string;
  
  bool isNaN(float *v) {
 -   return (isnan(v[0]) || isnan(v[1]) || isnan(v[2]));
upstream/spec-files-extra