rpms/stellarium/F-7 stellarium-0.9.0-cmake.patch, NONE, 1.1 stellarium-0.9.0-tm.patch, NONE, 1.1 sources, 1.11, 1.12 stellarium.spec, 1.28, 1.29 stellarium-0.7.1-gcc41.patch, 1.1, NONE stellarium-0.8.2-tm.patch, 1.1, NONE stellarium-0.8.2-x64.patch, 1.1, NONE stellarium-0.8.2-x64_1.patch, 1.1, NONE stellarium-0.8.2-x64_2.patch, 1.1, NONE

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Sun Aug 12 17:59:22 UTC 2007 

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5933

Modified Files:
	sources stellarium.spec 
Added Files:
	stellarium-0.9.0-cmake.patch stellarium-0.9.0-tm.patch 
Removed Files:
	stellarium-0.7.1-gcc41.patch stellarium-0.8.2-tm.patch 
	stellarium-0.8.2-x64.patch stellarium-0.8.2-x64_1.patch 
	stellarium-0.8.2-x64_2.patch 
Log Message:
New upstream release

stellarium-0.9.0-cmake.patch:

--- NEW FILE stellarium-0.9.0-cmake.patch ---
--- stellarium-0.9.0/CMakeLists.txt.cm	2007-06-12 21:49:29.000000000 +0200
+++ stellarium-0.9.0/CMakeLists.txt	2007-06-12 21:50:52.000000000 +0200
@@ -16,8 +16,8 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 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
  SET(STLPORT_LIBRARY "")
 ELSE(UNIX AND NOT WIN32)
  SET(CMAKE_C_FLAGS "-Wall -fexceptions -fident -mthreads -D_STLP_NO_CUSTOM_IO -D_STLP_USE_DYNAMIC_LIB  -I/home/fchereau/STLport/stlport -L/home/fchereau/STLport/lib")

stellarium-0.9.0-tm.patch:

--- NEW FILE stellarium-0.9.0-tm.patch ---
--- stellarium-0.9.0/src/stelutils/StelUtils.cpp.tmx	2007-08-07 20:17:02.000000000 +0200
+++ stellarium-0.9.0/src/stelutils/StelUtils.cpp	2007-08-07 20:18:18.000000000 +0200
@@ -796,6 +796,7 @@ void get_tm_from_julian(double JD, struc
 	tm_time->tm_min = date.minutes;
 	tm_time->tm_hour = date.hours;
 	tm_time->tm_mday = date.days;
+	tm_time->tm_wday = fmod(JD + 1.0,7);
 	tm_time->tm_mon = date.months - 1;
 	tm_time->tm_year = date.years - 1900;
 	tm_time->tm_isdst = -1;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Oct 2006 19:38:15 -0000	1.11
+++ sources	12 Aug 2007 17:58:50 -0000	1.12
@@ -1,2 +1,2 @@
-e83ca79bf904e03db869b314d72fd2a8  stellarium_user_guide-0.8.1-1.pdf
-8f4bcfcf6ad74ab57f1a9fc4f3927527  stellarium-0.8.2.tar.gz
+781a5171705c72e4dd3d08c9b1e4c15c  stellarium-0.9.0.tar.gz
+13370d7553538a803d181b1d3ac13d0e  stellarium_user_guide-0.9.0-1.pdf


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/F-7/stellarium.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- stellarium.spec	7 Aug 2007 19:31:37 -0000	1.28
+++ stellarium.spec	12 Aug 2007 17:58:50 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           stellarium
-Version:        0.8.2
-Release:        6%{?dist}
+Version:        0.9.0
+Release:        4%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -8,20 +8,21 @@
 URL:            http://stellarium.free.fr/
 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.8.1-1.pdf
-Patch1:		stellarium-0.8.2-x64_1.patch
-Patch2:		stellarium-0.8.2-x64_2.patch
-Patch3:		stellarium-0.8.2-tm.patch
+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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  ImageMagick
-BuildRequires:  libpng-devel
 BuildRequires:  freetype-devel
+BuildRequires:	cmake
+BuildRequires:	qt4-devel
+BuildRequires:	gettext-devel
+BuildRequires:	boost-devel
 
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
@@ -41,13 +42,14 @@
 
 %prep
 %setup -q
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1 
 
 %build
-%configure
-make %{?_smp_mflags}
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+%cmake -DCMAKE_BUILD_TYPE=Release
+make VERBOSE=1 %{?_smp_mflags}
 convert -size 32x32 data/icon.bmp stellarium.png
 
 %install
@@ -57,11 +59,7 @@
 desktop-file-install                            \
   --vendor fedora                               \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE1}
-iconv -f iso-8859-1 -t utf-8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1 \
-  -o $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8
-mv $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1.utf8 $RPM_BUILD_ROOT%{_mandir}/man1/stellarium.1
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 install -m 0644 -p stellarium.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png
 rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/{icon.bmp,stellarium.ico}
@@ -79,16 +77,23 @@
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_mandir}/man1/*
-
 
 %files doc
 %defattr(-,root,root,-) 
-%doc COPYING stellarium_user_guide-0.8.1-1.pdf
+%doc COPYING stellarium_user_guide-0.9.0-1.pdf
 
 %changelog
-* Mon Aug  6 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-6
-- Solve weekday displaying issue (#250621)
+* Thu Aug  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-4
+- Brbuild
+
+* Tue Aug  7 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-3
+- Solve wekkday displaying issue (#250621)
+
+* Wed Jun 27 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-2
+- Change category of the desktop entry (#241440)
+
+* Tue Jun 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.9.0-1
+- New upstream release
 
 * Sun Dec 17 2006 Jochen Schmitt <Jochen herr-schmitt de> 0.8.2-5
 - Resize icon to 32x32


--- stellarium-0.7.1-gcc41.patch DELETED ---


--- stellarium-0.8.2-tm.patch DELETED ---


--- stellarium-0.8.2-x64.patch DELETED ---


--- stellarium-0.8.2-x64_1.patch DELETED ---


--- stellarium-0.8.2-x64_2.patch DELETED ---

More information about the fedora-extras-commits mailing list