From f1cb72d7697602c46230bc6129bcbfc3ba484a82 Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Feb 14 2006 17:38:08 +0000
Subject: Description: Upload gcc41 patch.


---

diff --git a/stellarium-0.7.1-gcc41.patch b/stellarium-0.7.1-gcc41.patch
new file mode 100644
index 0000000..348a32b
--- /dev/null
+++ b/stellarium-0.7.1-gcc41.patch
@@ -0,0 +1,58 @@
+Index: stellarium-0.7.1/src/observator.h
+===================================================================
+--- stellarium-0.7.1.orig/src/observator.h
++++ stellarium-0.7.1/src/observator.h
+@@ -112,8 +112,8 @@ private:
+ 	string s_time_format_to_string(S_TIME_FORMAT) const;
+ 
+ 	// Convert the date format enum to its associated string and reverse
+-	S_DATE_FORMAT Observator::string_to_s_date_format(const string& df) const;
+-	string Observator::s_date_format_to_string(S_DATE_FORMAT df) const;
++	S_DATE_FORMAT string_to_s_date_format(const string& df) const;
++	string s_date_format_to_string(S_DATE_FORMAT df) const;
+ 
+ 	// for changing position
+ 	bool flag_move_to;
+Index: stellarium-0.7.1/src/projector.h
+===================================================================
+--- stellarium-0.7.1.orig/src/projector.h
++++ stellarium-0.7.1/src/projector.h
+@@ -75,7 +75,7 @@ public:
+ 	virtual void set_viewport(int x, int y, int w, int h);
+ 
+ 	// Fill with black around the circle
+-	void Projector::draw_viewport_shape(void);
++	void draw_viewport_shape(void);
+ 
+ 	int viewW(void) const {return vec_viewport[2];}
+ 	int viewH(void) const {return vec_viewport[3];}
+Index: stellarium-0.7.1/src/stel_command_interface.h
+===================================================================
+--- stellarium-0.7.1.orig/src/stel_command_interface.h
++++ stellarium-0.7.1/src/stel_command_interface.h
+@@ -43,9 +43,9 @@ class StelCommandInterface : CommandInte
+  public:
+   StelCommandInterface(stel_core * core);
+   virtual ~StelCommandInterface();
+-  virtual int StelCommandInterface::execute_command(string commandline);
+-  virtual int StelCommandInterface::execute_command(string command, double arg);
+-  virtual int StelCommandInterface::execute_command(string command, int arg);
++  virtual int execute_command(string commandline);
++  virtual int execute_command(string command, double arg);
++  virtual int execute_command(string command, int arg);
+   virtual int execute_command(string command, unsigned long int &wait, bool trusted);
+   virtual int set_flag(string name, string value, bool &newval, bool trusted);
+   void update(int delta_time);
+Index: stellarium-0.7.1/src/stel_ui.h
+===================================================================
+--- stellarium-0.7.1.orig/src/stel_ui.h
++++ stellarium-0.7.1/src/stel_ui.h
+@@ -316,7 +316,7 @@ private:
+ 	void tui_cb_sky_time();        // change effect parameters
+ 
+ 	// Parse a file of type /usr/share/zoneinfo/zone.tab
+-	s_tui::MultiSet_item<string>* stel_ui::create_tree_from_time_zone_file(const string& zonetab);
++	s_tui::MultiSet_item<string>* create_tree_from_time_zone_file(const string& zonetab);
+ 
+ 	bool ScriptDirectoryRead;
+ };
diff --git a/stellarium.spec b/stellarium.spec
index 4c18054..86fce18 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.7.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %doc COPYING stellarium_user_guide-0.7.1-1.pdf
 
 %changelog
-* Tue Feb 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.7.1-6
+* Tue Feb 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.7.1-7
 - Add stellarium user guide as doc subpackage
 - Add gcc41 patch from Diego Petteno