From 04458d558ce1ef392a0a545981876c309097f282 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Mar 30 2009 18:29:31 +0000 Subject: Update to current release to get compatible for Qt-4.5 --- diff --git a/sources b/sources index d4f0ad1..1f47dcb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d0d55cb1ff5acd08a4d3b27d953579c0 stellarium-0.9.1.tar.gz -13370d7553538a803d181b1d3ac13d0e stellarium_user_guide-0.9.0-1.pdf +c544fff9e75e9317055075b658ae5924 stellarium-0.10.2.tar.gz +0e708c4c0af77712c64b22cbfa398fb4 stellarium_user_guide-0.9.1-1.pdf diff --git a/stellarium-0.10.0-fonts.patch b/stellarium-0.10.0-fonts.patch new file mode 100644 index 0000000..e6e8d8b --- /dev/null +++ b/stellarium-0.10.0-fonts.patch @@ -0,0 +1,11 @@ +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 ) diff --git a/stellarium-0.10.2-cmake.patch b/stellarium-0.10.2-cmake.patch new file mode 100644 index 0000000..b452634 --- /dev/null +++ b/stellarium-0.10.2-cmake.patch @@ -0,0 +1,14 @@ +diff -up stellarium-0.10.2/CMakeLists.txt.cm stellarium-0.10.2/CMakeLists.txt +--- stellarium-0.10.2/CMakeLists.txt.cm 2009-03-09 12:28:34.000000000 +0100 ++++ stellarium-0.10.2/CMakeLists.txt 2009-03-12 22:01:54.000000000 +0100 +@@ -22,8 +22,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" + ENDIF() + + IF(UNIX AND NOT WIN32) +- SET(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-parameter") # additional C compile flags +- SET(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter") # 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") diff --git a/stellarium-0.9.1-cmake.patch b/stellarium-0.9.1-cmake.patch deleted file mode 100644 index 61d62cb..0000000 --- a/stellarium-0.9.1-cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -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") diff --git a/stellarium-0.9.1-gcc43.patch b/stellarium-0.9.1-gcc43.patch deleted file mode 100644 index f2f5424..0000000 --- a/stellarium-0.9.1-gcc43.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up stellarium-0.9.1/src/StringArray.cpp.gcc43 stellarium-0.9.1/src/StringArray.cpp ---- stellarium-0.9.1/src/StringArray.cpp.gcc43 2008-02-11 15:53:13.000000000 +0100 -+++ stellarium-0.9.1/src/StringArray.cpp 2008-02-11 15:53:33.000000000 +0100 -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - using namespace std; - - namespace BigStarCatalogExtension { -diff -up stellarium-0.9.1/src/stelutils/STexture.cpp.gcc43 stellarium-0.9.1/src/stelutils/STexture.cpp ---- stellarium-0.9.1/src/stelutils/STexture.cpp.gcc43 2008-01-17 15:15:35.000000000 +0100 -+++ stellarium-0.9.1/src/stelutils/STexture.cpp 2008-02-11 15:51:20.000000000 +0100 -@@ -76,6 +76,8 @@ STexture::~STexture() - mutex = NULL; - } - -+#include -+ - /************************************************************************* - This method should be called if the texture loading failed for any reasons - *************************************************************************/ diff --git a/stellarium.spec b/stellarium.spec index 1be0bd3..bdbf4f2 100644 --- a/stellarium.spec +++ b/stellarium.spec @@ -1,16 +1,18 @@ +%define guidever 0.9.1-1 + Name: stellarium -Version: 0.9.1 -Release: 6%{?dist} +Version: 0.10.2 +Release: 2%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics -License: GPLv2 +License: GPLv2+ URL: http://stellarium.free.fr/ -Source0: http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz +Source0: http://downloads.sourceforge.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.1-cmake.patch -Patch3: stellarium-0.9.1-gcc43.patch +Source2: http://downloads.sourceforge.net/stellarum/stellarium_user_guide-%{guidever}.pdf +Patch1: stellarium-0.10.2-cmake.patch +Patch2: stellarium-0.10.0-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,13 +22,21 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: freetype-devel BuildRequires: cmake -BuildRequires: qt4-devel +BuildRequires: qt4-devel >= 4.4.2 BuildRequires: gettext-devel BuildRequires: boost-devel BuildRequires: glib2-devel Requires: opengl-games-utils +%if 0%{?fedora} > 10 +Requires: dejavu-sans-fonts dejavu-sans-mono-fonts +%endif + +%if 0%{?fedora} <= 10 +Requires: dejavu-fonts +%endif + %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 @@ -36,7 +46,8 @@ constellations, planets, major satellites and nebulas. %package doc Summary: The user guide about Stellarium Group: Documentation -License: GPL +License: GFDL + %description doc The user guide for stellarium writeen by Matthew Gates. It shouuld contains everythings you want to know about Stellarium. @@ -46,7 +57,7 @@ You will need a PDF viewer to read the user guide. %prep %setup -q %patch1 -p1 -b .cm -%patch3 -p1 -b .gcc43 +%patch2 -p1 -b .fp %build export CFLAGS="$RPM_OPT_FLAGS" @@ -65,12 +76,18 @@ desktop-file-install \ %{SOURCE1} 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} +rm $RPM_BUILD_ROOT%{_datadir}/stellarium/data/stellarium.ico cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version} 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 %clean rm -rf $RPM_BUILD_ROOT @@ -83,13 +100,41 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name} %{_datadir}/applications/*%{name}.desktop %{_datadir}/pixmaps/%{name}.png +%{_mandir}/man1/stellarium.1.gz %files doc %defattr(-,root,root,-) -%doc COPYING stellarium_user_guide-0.9.0-1.pdf +%doc COPYING stellarium_user_guide-%{guidever}.pdf %changelog -* Mon Feb 11 2008 Jochen Schmitt 0.9.1-6 +* Tue Mar 24 2009 Jochen Schmitt 0.10.2-2 +- Changed desktop file (#491922) + +* Thu Mar 12 2009 Jochen Schmitt 0.10.2-1 +- New upstream release + +* Thu Mar 5 2009 Jochen Schmitt 0.10.1-4 +- Support noarch subpackates + +* Wed Feb 25 2009 Fedora Release Engineering - 0.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Feb 8 2009 Jochen Schmitt 0.10.1-2 +- New upstream release + +* Sun Jan 18 2009 Jochen Schmitt 0.10.0-3 +- Change Req. to fonts pakcage because fonts package renaming (#480474) + +* Sun Jan 4 2009 Jochen Schmitt 0.10.0-2 +- Create symlinks to DejaVu fonts (#477460) + +* Wed Sep 24 2008 Jochen Schmitt 0.10.0-1 +- New upstream release + +* Sat Sep 6 2008 Tom "spot" Callaway 0.9.1-7 +- fix license tag + +* Mon Feb 11 2008 Jochen Schmitt 0.9.1-6 - Fix gcc-4.3 related issues * Tue Jan 22 2008 Jochen Schmitt 0.9.1-1