rpms/stellarium/devel stellarium-0.9.1-cmake.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.12, 1.13 stellarium.spec, 1.35, 1.36 stellarium-0.9.0-cmake.patch, 1.1, NONE stellarium-0.9.0-tm.patch, 1.1, NONE

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	.cvsignore sources stellarium.spec 
Added Files:
	stellarium-0.9.1-cmake.patch 
Removed Files:
	stellarium-0.9.0-cmake.patch stellarium-0.9.0-tm.patch 
Log Message:
New upstream release

stellarium-0.9.1-cmake.patch:

--- NEW FILE stellarium-0.9.1-cmake.patch ---
diff -up stellarium-0.9.1/CMakeLists.txt.cm stellarium-0.9.1/CMakeLists.txt
--- stellarium-0.9.1/CMakeLists.txt.cm	2008-01-17 15:15:42.000000000 +0100
+++ stellarium-0.9.1/CMakeLists.txt	2008-01-22 15:58:51.000000000 +0100
@@ -20,8 +20,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 IF(UNIX AND NOT WIN32)
- SET(CMAKE_C_FLAGS -Wall)       # additional C compile flags
- SET(CMAKE_CXX_FLAGS -Wall)     # additional CPP compile flags
+ SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS})       # additional C compile flags
+ SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})     # additional CPP compile flags
 ELSE(UNIX AND NOT WIN32)
  SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads")
  SET(CMAKE_CXX_FLAGS "-Wall -Wsign-promo -fexceptions -fident -mthreads")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Jun 2007 20:21:05 -0000	1.10
+++ .cvsignore	22 Jan 2008 16:08:55 -0000	1.11
@@ -1,2 +1 @@
-stellarium-0.9.0.tar.gz
-stellarium_user_guide-0.9.0-1.pdf
+stellarium-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jun 2007 20:21:05 -0000	1.12
+++ sources	22 Jan 2008 16:08:55 -0000	1.13
@@ -1,2 +1 @@
-781a5171705c72e4dd3d08c9b1e4c15c  stellarium-0.9.0.tar.gz
-13370d7553538a803d181b1d3ac13d0e  stellarium_user_guide-0.9.0-1.pdf
+d0d55cb1ff5acd08a4d3b27d953579c0  stellarium-0.9.1.tar.gz


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- stellarium.spec	4 Jan 2008 23:07:15 -0000	1.35
+++ stellarium.spec	22 Jan 2008 16:08:55 -0000	1.36
@@ -1,5 +1,7 @@
 Name:           stellarium
-Version:        0.9.0
+<<<<<<< stellarium.spec
+Version:        0.9.1
+Release:        1%{?dist}
 Release:        7%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
@@ -9,8 +11,7 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.9.0-1.pdf
-Patch1:		stellarium-0.9.0-cmake.patch
-Patch2:		stellarium-0.9.0-tm.patch
+Patch1:		stellarium-0.9.1-cmake.patch
 Patch3:		stellarium-0.9.0-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,7 @@
 BuildRequires:	qt4-devel
 BuildRequires:	gettext-devel
 BuildRequires:	boost-devel
+BuildRequires:	glib2-devel
 
 Requires:	opengl-games-utils
 
@@ -45,9 +47,14 @@
 
 %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"
@@ -78,7 +85,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README 
 %{_bindir}/stellarium
 %{_bindir}/stellarium-wrapper
 %{_datadir}/%{name}
@@ -90,6 +97,10 @@
 %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
+
 * Thu Jan 03 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.9.0-7
 - Adding missing includes to fix build with gcc-4.3
 - Corrected License tag of -doc subpackage


--- stellarium-0.9.0-cmake.patch DELETED ---


--- stellarium-0.9.0-tm.patch DELETED ---