rpms/stellarium/devel stellarium.spec,1.37,1.38

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	stellarium.spec 
Log Message:
New upstream release


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- stellarium.spec	22 Jan 2008 16:10:27 -0000	1.37
+++ stellarium.spec	22 Jan 2008 16:12:23 -0000	1.38
@@ -1,4 +1,4 @@
-Name:           stellarium
+ame:           stellarium
 Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
@@ -45,14 +45,8 @@
 
 %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 @@
 %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