rpms/stellarium/F-10 stellarium-0.10.0-fonts.patch, NONE, 1.1 stellarium-0.10.1-cmake.patch, NONE, 1.1 sources, 1.15, 1.16 stellarium.spec, 1.49, 1.50 stellarium-0.9.1-cmake.patch, 1.1, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25193

Modified Files:
	sources stellarium.spec 
Added Files:
	stellarium-0.10.0-fonts.patch stellarium-0.10.1-cmake.patch 
Removed Files:
	stellarium-0.9.1-cmake.patch 
Log Message:
New upstream release

stellarium-0.10.0-fonts.patch:

--- NEW FILE stellarium-0.10.0-fonts.patch ---
diff -up stellarium-0.10.0/data/CMakeLists.txt.fp stellarium-0.10.0/data/CMakeLists.txt
--- stellarium-0.10.0/data/CMakeLists.txt.fp	2009-01-04 19:20:51.000000000 +0100
+++ stellarium-0.10.0/data/CMakeLists.txt	2009-01-04 19:21:25.000000000 +0100
@@ -1,6 +1,6 @@
 ########### install files ###############
 
-INSTALL(FILES stellarium.ico ssystem.ini zone.tab base_locations.txt DejaVuSans.ttf default_config.ini DejaVuSansMono.ttf constellations_boundaries.dat fontmap.dat iso639-1.utf8 countryCodes.dat DESTINATION share/${PACKAGE}/data)
+INSTALL(FILES stellarium.ico ssystem.ini zone.tab base_locations.txt default_config.ini constellations_boundaries.dat fontmap.dat iso639-1.utf8 countryCodes.dat DESTINATION share/${PACKAGE}/data)
 
 IF(MACOSX)
 INSTALL(FILES Icon.icns DESTINATION share )

stellarium-0.10.1-cmake.patch:

--- NEW FILE stellarium-0.10.1-cmake.patch ---
diff -up stellarium-0.10.1/CMakeLists.txt.cm stellarium-0.10.1/CMakeLists.txt
--- stellarium-0.10.1/CMakeLists.txt.cm	2009-02-08 21:39:38.000000000 +0100
+++ stellarium-0.10.1/CMakeLists.txt	2009-02-08 21:41:11.000000000 +0100
@@ -22,8 +22,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
 ENDIF()
 
 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()
  SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads")
  SET(CMAKE_CXX_FLAGS "-Wall -Wsign-promo -fexceptions -fident -mthreads")


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-10/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	24 Sep 2008 19:57:45 -0000	1.15
+++ sources	9 Feb 2009 15:23:36 -0000	1.16
@@ -1,2 +1,2 @@
-09465fa11a8caab7a4410f1e5ff6eb8c  stellarium-0.10.0.tgz
 0e708c4c0af77712c64b22cbfa398fb4  stellarium_user_guide-0.9.1-1.pdf
+5361e1db3bbce38bb6b4208bd4a2e556  stellarium-0.10.1.tar.gz


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-10/stellarium.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- stellarium.spec	24 Sep 2008 19:57:45 -0000	1.49
+++ stellarium.spec	9 Feb 2009 15:23:36 -0000	1.50
@@ -1,17 +1,18 @@
 %define guidever 0.9.1-1
 
 Name:           stellarium
-Version:        0.10.0
-Release:        1%{?dist}
+Version:        0.10.1
+Release:        2%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://stellarium.free.fr/
-Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tgz
+Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf
-Patch1:		stellarium-0.9.1-cmake.patch
+Patch1:		stellarium-0.10.1-cmake.patch
+Patch2:		stellarium-0.10.0-fonts.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +29,8 @@
 
 Requires:	opengl-games-utils
 
+Requires:	dejavu-fonts-sans dejavu-fonts-sans-mono
+
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
@@ -47,6 +50,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .cm
+%patch2 -p1 -b .fp
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -70,6 +74,10 @@
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
 
+( cd $RPM_BUILD_ROOT%{_datadir}/stellarium/data;
+  ln -sf ../../fonts/dejavu/DejaVuSans.ttf DejaVuSans.ttf;
+  ln -sf ../../fonts/dejavu/DejaVuSansMono.ttf DeJaVuSansMono.ttf; )
+
 %find_lang %{name}
 %find_lang %{name}-skycultures
 cat %{name}-skycultures.lang >>%{name}.lang
@@ -92,6 +100,15 @@
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Sun Feb  8 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.1-2
+- New upstream release
+
+* Sun Jan 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-3
+- Change Req. to fonts pakcage because fonts package renaming (#480474)
+
+* Sun Jan  4 2009 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-2
+- Create symlinks to DejaVu fonts (#477460)
+
 * Wed Sep 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.10.0-1
 - New upstream release
 


--- stellarium-0.9.1-cmake.patch DELETED ---