From 2cd75e3aa893d07fdfa703ab9d3f860c49cf8736 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Feb 24 2010 17:06:46 +0000 Subject: New upstream release --- diff --git a/sources b/sources index 2771ff1..74025a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c544fff9e75e9317055075b658ae5924 stellarium-0.10.2.tar.gz +ebb81f609c91be6ecd7e91cf7d3a4afa stellarium-0.10.4.tar.gz 8da17ee33510f57cbfdb321d8ae43c59 stellarium_user_guide-0.10.2-1.pdf diff --git a/stellarium-0.10.0-fonts.patch b/stellarium-0.10.0-fonts.patch deleted file mode 100644 index e6e8d8b..0000000 --- a/stellarium-0.10.0-fonts.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index b452634..0000000 --- a/stellarium-0.10.2-cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.10.3-cmake.patch b/stellarium-0.10.3-cmake.patch new file mode 100644 index 0000000..aa04e39 --- /dev/null +++ b/stellarium-0.10.3-cmake.patch @@ -0,0 +1,14 @@ +diff -up stellarium-0.10.3/CMakeLists.txt.org stellarium-0.10.3/CMakeLists.txt +--- stellarium-0.10.3/CMakeLists.txt.org 2010-01-31 19:18:26.272841500 +0100 ++++ stellarium-0.10.3/CMakeLists.txt 2010-01-31 19:24:39.738841658 +0100 +@@ -29,8 +29,8 @@ 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.spec b/stellarium.spec index a825e83..45dbece 100644 --- a/stellarium.spec +++ b/stellarium.spec @@ -1,8 +1,9 @@ %define guidever 0.10.2-1 Name: stellarium -Version: 0.10.2 -Release: 5%{?dist} + +Version: 0.10.4 +Release: 3%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -11,8 +12,7 @@ URL: http://stellarium.free.fr/ Source0: http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tar.gz Source1: stellarium.desktop Source2: http://downloads.sourceforge.net/stellarium/stellarium_user_guide-%{guidever}.pdf -Patch1: stellarium-0.10.2-cmake.patch -Patch2: stellarium-0.10.0-fonts.patch +Patch1: stellarium-0.10.3-cmake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +22,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: freetype-devel BuildRequires: cmake -BuildRequires: qt4-devel >= 4.4.2 +BuildRequires: qt4-devel >= 4.6.0 BuildRequires: gettext-devel BuildRequires: boost-devel BuildRequires: glib2-devel @@ -57,7 +57,6 @@ You will need a PDF viewer to read the user guide. %prep %setup -q %patch1 -p1 -b .cm -%patch2 -p1 -b .fp %build export CFLAGS="$RPM_OPT_FLAGS" @@ -81,9 +80,7 @@ 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; ) +rm -f $RPM_BUILD_ROOT%{_datadir}/stellarium/data/*.ttf %find_lang %{name} %find_lang %{name}-skycultures @@ -107,6 +104,24 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING stellarium_user_guide-%{guidever}.pdf %changelog +* Wed Feb 24 2010 Jochen Schmitt 0.10.4-3 +- Remove font files + +* Tue Feb 23 2010 Jochen Schmitt 0.10.4-2 +- Fix uploaded sources + +* Tue Feb 23 2010 Jochen Schmitt 0.10.4-1 +- New upstream release + +* Sun Jan 31 2010 Jochen Schmitt 0.10.3-1 +- New upstream release (#559929) + +* Wed Nov 25 2009 Kevin Kofler 0.10.2-7 +- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) + +* Sun Nov 1 2009 Jochen Schmitt 0.10.2-6 +- Remove symlink to font files + * Thu Sep 24 2009 Jochen Schmitt 0.10.2-5 - Updated program documentation (#525302)