From b22382370184016aa743ef5e41840d78a1dfd170 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Nov 26 2004 08:21:16 +0000
Subject: Merge stellarium-0.6.1-0.fdr.1.2.src.rpm update from Marius.


---

diff --git a/.cvsignore b/.cvsignore
index ccc60e6..f594ee7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-stellarium-0.6.0.tar.gz
+stellarium-0.6.1.tar.gz
diff --git a/sources b/sources
index 3a88d10..f4c05a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-820a9246cb8c17c1ef6361100984ccbe  stellarium-0.6.0.tar.gz
+1065f8ba5a47c7b91997e8bf78d7549e  stellarium-0.6.1.tar.gz
diff --git a/stellarium-0.6.0-sdl-nvidia.patch b/stellarium-0.6.0-sdl-nvidia.patch
deleted file mode 100644
index f310538..0000000
--- a/stellarium-0.6.0-sdl-nvidia.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/stel_sdl.cpp.orig	Thu Jun 17 14:11:01 2004
-+++ src/stel_sdl.cpp	Thu Jun 17 14:16:40 2004
-@@ -60,9 +60,18 @@
-     Screen = SDL_SetVideoMode(core->get_screen_W(), core->get_screen_H(), core->get_bppMode(), Vflags);
- 	if(!Screen)
- 	{
--		printf("sdl: Couldn't set %dx%d video mode: %s!",
-+		printf("sdl: Couldn't set %dx%d video mode (%s), retrying with stencil size 0\n",
- 		core->get_screen_W(), core->get_screen_H(), SDL_GetError());
--		exit(-1);
-+
-+		SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE,0);
-+		Screen = SDL_SetVideoMode(core->get_screen_W(), core->get_screen_H(), core->get_bppMode(), Vflags);
-+
-+		if(!Screen)
-+		{
-+			printf("sdl: Couldn't set %dx%d video mode: %s!\n",
-+			core->get_screen_W(), core->get_screen_H(), SDL_GetError());
-+			exit(-1);
-+		}
- 	}
- 
- 	// Disable key repeat
diff --git a/stellarium.spec b/stellarium.spec
index 1cbd3d7..fbed361 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -1,16 +1,15 @@
 Name:           stellarium
-Version:        0.6.0
-Release:        0.fdr.2.2
+Version:        0.6.1
+Release:        1
 Epoch:          0
 Summary:        A photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPL
 URL:            http://stellarium.free.fr/
-Source0:        http://dl.sf.net/stellarium/stellarium-0.6.0.tar.gz
+Source0:        http://dl.sf.net/stellarium/stellarium-0.6.1.tar.gz
 Source1:        stellarium.desktop
 Patch0:         stellarium-0.6.0-optflags.patch
-Patch1:         stellarium-0.6.0-sdl-nvidia.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -27,7 +26,6 @@ constellations, planets, major satellites and nebulas.
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
 
 
 %build
@@ -68,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 17 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.6.1-1
+- Updated to 0.6.1.
+
 * Sat Aug 21 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.6.0-0.fdr.2
 - Patched to honour optflags.
 - Added nvidia specific patch.