rpms/SolarModel/F-12 SolarModel-2.1-Fedora.patch, 1.1, 1.2 SolarModel.spec, 1.4, 1.5
Tom Callaway
spot at fedoraproject.org
Tue May 18 19:02:03 UTC 2010
Author: spot
Update of /cvs/pkgs/rpms/SolarModel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv365/F-12
Modified Files:
SolarModel-2.1-Fedora.patch SolarModel.spec
Log Message:
brown paper bag fix, forgot to set a path for config.dat loading
SolarModel-2.1-Fedora.patch:
GameMain.cpp | 10 +++++-----
GameMeasurer.cpp | 12 ++++++------
Makefile | 11 ++++-------
3 files changed, 15 insertions(+), 18 deletions(-)
Index: SolarModel-2.1-Fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/F-12/SolarModel-2.1-Fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- SolarModel-2.1-Fedora.patch 12 Jan 2009 16:38:58 -0000 1.1
+++ SolarModel-2.1-Fedora.patch 18 May 2010 19:02:03 -0000 1.2
@@ -1,6 +1,15 @@
diff -up SolarModel_src/GameMain.cpp.Fedora SolarModel_src/GameMain.cpp
--- SolarModel_src/GameMain.cpp.Fedora 2008-06-01 06:29:58.000000000 -0400
-+++ SolarModel_src/GameMain.cpp 2009-01-05 17:15:52.000000000 -0500
++++ SolarModel_src/GameMain.cpp 2010-05-18 14:32:35.345827475 -0400
+@@ -3,7 +3,7 @@
+
+ void GameSetup()
+ {
+- GameConfig::Load("config.dat", &Game);
++ GameConfig::Load("/usr/share/SolarModel/config.dat", &Game);
+ }
+
+ const float distances[] = { // array of distances from the Sun
@@ -109,7 +109,7 @@ void GameInit()
// Maps setup
@@ -37,7 +46,7 @@ diff -up SolarModel_src/GameMain.cpp.Fed
+}
diff -up SolarModel_src/GameMeasurer.cpp.Fedora SolarModel_src/GameMeasurer.cpp
--- SolarModel_src/GameMeasurer.cpp.Fedora 2008-05-31 01:34:54.000000000 -0400
-+++ SolarModel_src/GameMeasurer.cpp 2009-01-05 17:16:25.000000000 -0500
++++ SolarModel_src/GameMeasurer.cpp 2010-05-18 14:30:04.006828154 -0400
@@ -298,23 +298,23 @@ core::stringw GameMeasurer::GetDistanceA
if (distanceKM < 100)
@@ -71,7 +80,7 @@ diff -up SolarModel_src/GameMeasurer.cpp
+}
diff -up SolarModel_src/Makefile.Fedora SolarModel_src/Makefile
--- SolarModel_src/Makefile.Fedora 2008-05-31 02:29:00.000000000 -0400
-+++ SolarModel_src/Makefile 2009-01-05 17:16:03.000000000 -0500
++++ SolarModel_src/Makefile 2010-05-18 14:30:04.007827665 -0400
@@ -1,14 +1,11 @@
# Makefile for SolarModel
Index: SolarModel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/F-12/SolarModel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- SolarModel.spec 24 Jul 2009 16:24:08 -0000 1.4
+++ SolarModel.spec 18 May 2010 19:02:03 -0000 1.5
@@ -1,7 +1,7 @@
Name: SolarModel
Summary: Real-time 3D Solar System simulation
Version: 2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPL+
Group: System Environment/Base
Source0: http://downloads.sourceforge.net/solarmodel/%{name}_src_2_1.zip
@@ -67,6 +67,9 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/SolarModel.png
%changelog
+* Tue May 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1-6
+- fix segfault caused by code not looking in correct place for config.dat
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list