devel/stellarium stellarium-0.6.2-gcc4.patch, NONE, 1.1 stellarium.spec, 1.6, 1.7

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/devel/stellarium
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30014

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.6.2-gcc4.patch 
Log Message:
* Thu Apr 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.2-4
- Fix build for GCC4.
- Fix desktop icon installation.



stellarium-0.6.2-gcc4.patch:

--- NEW FILE stellarium-0.6.2-gcc4.patch ---
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<T>&) const;
     inline Vector2 operator+(const Vector2<T>&) const;
 
-	inline Vector2 Vector2<T>::operator-() const;
-	inline Vector2 Vector2<T>::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<T>&) const;
     inline Vector3 operator+(const Vector3<T>&) const;
 
-	inline Vector3 Vector3<T>::operator-() const;
-	inline Vector3 Vector3<T>::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<T>&) const;
     inline Vector4 operator+(const Vector4<T>&) const;
 
-	inline Vector4 Vector4<T>::operator-() const;
-	inline Vector4 Vector4<T>::operator+() const;
+	inline Vector4 operator-() const;
+	inline Vector4 operator+() const;
 
 	inline Vector4 operator*(T) const;
 	inline Vector4 operator/(T) const;


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/devel/stellarium/stellarium.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- stellarium.spec	6 Apr 2005 22:13:32 -0000	1.6
+++ stellarium.spec	13 Apr 2005 23:28:13 -0000	1.7
@@ -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 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p6
+%patch1 -p1 -b .gcc4
 
 
 %build
@@ -47,7 +48,7 @@
   -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 @@
 
 
 %changelog
+* Thu Apr 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.2-4
+- Fix build for GCC4.
+- Fix desktop icon installation.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt