From 1c9de099c029b149a5f8d540f50990d80227e83a Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Jan 22 2008 16:12:23 +0000
Subject: New upstream release


---

diff --git a/stellarium.spec b/stellarium.spec
index 36f073c..07f142f 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -1,4 +1,4 @@
-Name:           stellarium
+ame:           stellarium
 Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
@@ -45,14 +45,8 @@ You will need a PDF viewer to read the user guide.
 
 %prep
 %setup -q
-<<<<<<< stellarium.spec
 %patch1 -p1 -b .cm
 %patch3 -p1 -b .gcc43
-=======
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
->>>>>>> 1.35
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -95,7 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-0.9.0-1.pdf
 
 %changelog
-<<<<<<< stellarium.spec
 * Tue Jan 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-1
 - New upstream release