diff --git a/stellarium-0.8.2-x64_1.patch b/stellarium-0.8.2-x64_1.patch deleted file mode 100644 index 82f7337..0000000 --- a/stellarium-0.8.2-x64_1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/translator.cpp 2006-10-05 09:12:12.000000000 +0100 -+++ src/translator.cpp 2006-10-22 21:34:22.000000000 +0100 -@@ -71,7 +71,7 @@ - } - - //change systemLangName to ISO 639 / ISO 3166. -- unsigned int pos = Translator::systemLangName.find(':', 0); -+ std::string::size_type pos = Translator::systemLangName.find(':', 0); - if(pos != Translator::systemLangName.npos) - Translator::systemLangName.resize(pos); - pos = Translator::systemLangName.find('.', 0); diff --git a/stellarium-0.9.0-gcc43.patch b/stellarium-0.9.0-gcc43.patch new file mode 100644 index 0000000..1066eb9 --- /dev/null +++ b/stellarium-0.9.0-gcc43.patch @@ -0,0 +1,17 @@ +The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in +unnecessary dependencies which aren't requested by the standard. +This fixes build for gcc-4.3 + +Lubomir Kundrak + +diff -rup stellarium-0.9.0.orig/src/stelutils/STexture.cpp stellarium-0.9.0/src/stelutils/STexture.cpp +--- stellarium-0.9.0.orig/src/stelutils/STexture.cpp 2007-06-06 10:25:17.000000000 +0200 ++++ stellarium-0.9.0/src/stelutils/STexture.cpp 2008-01-03 21:53:11.000000000 +0100 +@@ -18,6 +18,7 @@ + */ + + #include ++#include + #include "STexture.hpp" + + /************************************************************************* diff --git a/stellarium.spec b/stellarium.spec index 10518ea..0aefb7e 100644 --- a/stellarium.spec +++ b/stellarium.spec @@ -1,6 +1,6 @@ Name: stellarium Version: 0.9.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -11,6 +11,7 @@ Source1: stellarium.desktop Source2: http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.9.0-1.pdf Patch1: stellarium-0.9.0-cmake.patch Patch2: stellarium-0.9.0-tm.patch +Patch3: stellarium-0.9.0-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,7 +36,7 @@ constellations, planets, major satellites and nebulas. %package doc Summary: The user guide about Stellarium Group: Documentation -License: GPL +License: GPLv2 %description doc The user guide for stellarium writeen by Matthew Gates. It shouuld contains everythings you want to know about Stellarium. @@ -46,6 +47,7 @@ You will need a PDF viewer to read the user guide. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -88,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING stellarium_user_guide-0.9.0-1.pdf %changelog +* Thu Jan 03 2008 Lubomir Kundrak 0.9.0-7 +- Adding missing includes to fix build with gcc-4.3 +- Corrected License tag of -doc subpackage + * Tue Oct 23 2007 Will Woods 0.9.0-6 - Fix opengl-game-wrapper.sh usage