diff --git a/stellarium-0.6.2-gcc4.patch b/stellarium-0.6.2-gcc4.patch new file mode 100644 index 0000000..b57b776 --- /dev/null +++ b/stellarium-0.6.2-gcc4.patch @@ -0,0 +1,36 @@ +diff -Nur stellarium-0.6.2-orig/src/vecmath.h stellarium-0.6.2/src/vecmath.h +--- stellarium-0.6.2-orig/src/vecmath.h 2004-10-09 02:14:04.000000000 +0200 ++++ stellarium-0.6.2/src/vecmath.h 2005-04-14 01:02:11.000000000 +0200 +@@ -73,8 +73,8 @@ + inline Vector2 operator-(const Vector2&) const; + inline Vector2 operator+(const Vector2&) const; + +- inline Vector2 Vector2::operator-() const; +- inline Vector2 Vector2::operator+() const; ++ inline Vector2 operator-() const; ++ inline Vector2 operator+() const; + + inline Vector2 operator*(T) const; + inline Vector2 operator/(T) const; +@@ -119,8 +119,8 @@ + inline Vector3 operator-(const Vector3&) const; + inline Vector3 operator+(const Vector3&) const; + +- inline Vector3 Vector3::operator-() const; +- inline Vector3 Vector3::operator+() const; ++ inline Vector3 operator-() const; ++ inline Vector3 operator+() const; + + inline Vector3 operator*(T) const; + inline Vector3 operator/(T) const; +@@ -168,8 +168,8 @@ + inline Vector4 operator-(const Vector4&) const; + inline Vector4 operator+(const Vector4&) const; + +- inline Vector4 Vector4::operator-() const; +- inline Vector4 Vector4::operator+() const; ++ inline Vector4 operator-() const; ++ inline Vector4 operator+() const; + + inline Vector4 operator*(T) const; + inline Vector4 operator/(T) const; diff --git a/stellarium.spec b/stellarium.spec index 27204f9..4299741 100644 --- a/stellarium.spec +++ b/stellarium.spec @@ -1,7 +1,6 @@ Name: stellarium Version: 0.6.2 -Release: 3 - +Release: 4 Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -10,6 +9,7 @@ URL: http://stellarium.free.fr/ Source0: http://dl.sf.net/stellarium/stellarium-0.6.2.tar.gz Source1: stellarium.desktop Patch0: stellarium-0.6.2-optflags.patch +Patch1: stellarium-0.6.2-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -26,6 +26,7 @@ constellations, planets, major satellites and nebulas. %prep %setup -q %patch0 -p6 +%patch1 -p1 -b .gcc4 %build @@ -47,7 +48,7 @@ iconv -f iso-8859-1 -t utf-8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 \ -o $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -install -m 0644 -p stellarium.png.2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png +install -m 0644 -p stellarium-2.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,files_format.txt,stellarium.ico} @@ -66,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 14 2005 Michael Schwendt - 0.6.2-4 +- Fix build for GCC4. +- Fix desktop icon installation. + * Fri Apr 7 2005 Michael Schwendt - rebuilt