diff --git a/.cvsignore b/.cvsignore index d335f42..db73e0e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -stellarium-0.8.0.tar.gz -stellarium_user_guide-0.7.1-1.pdf -stellarium_user_guide-0.8.0-1.pdf +stellarium-0.9.0.tar.gz +stellarium_user_guide-0.9.0-1.pdf diff --git a/sources b/sources index eccac81..c8eea51 100644 --- a/sources +++ b/sources @@ -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 diff --git a/stellarium-0.7.1-gcc41.patch b/stellarium-0.7.1-gcc41.patch deleted file mode 100644 index 348a32b..0000000 --- a/stellarium-0.7.1-gcc41.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: stellarium-0.7.1/src/observator.h -=================================================================== ---- stellarium-0.7.1.orig/src/observator.h -+++ stellarium-0.7.1/src/observator.h -@@ -112,8 +112,8 @@ private: - string s_time_format_to_string(S_TIME_FORMAT) const; - - // Convert the date format enum to its associated string and reverse -- S_DATE_FORMAT Observator::string_to_s_date_format(const string& df) const; -- string Observator::s_date_format_to_string(S_DATE_FORMAT df) const; -+ S_DATE_FORMAT string_to_s_date_format(const string& df) const; -+ string s_date_format_to_string(S_DATE_FORMAT df) const; - - // for changing position - bool flag_move_to; -Index: stellarium-0.7.1/src/projector.h -=================================================================== ---- stellarium-0.7.1.orig/src/projector.h -+++ stellarium-0.7.1/src/projector.h -@@ -75,7 +75,7 @@ public: - virtual void set_viewport(int x, int y, int w, int h); - - // Fill with black around the circle -- void Projector::draw_viewport_shape(void); -+ void draw_viewport_shape(void); - - int viewW(void) const {return vec_viewport[2];} - int viewH(void) const {return vec_viewport[3];} -Index: stellarium-0.7.1/src/stel_command_interface.h -=================================================================== ---- stellarium-0.7.1.orig/src/stel_command_interface.h -+++ stellarium-0.7.1/src/stel_command_interface.h -@@ -43,9 +43,9 @@ class StelCommandInterface : CommandInte - public: - StelCommandInterface(stel_core * core); - virtual ~StelCommandInterface(); -- virtual int StelCommandInterface::execute_command(string commandline); -- virtual int StelCommandInterface::execute_command(string command, double arg); -- virtual int StelCommandInterface::execute_command(string command, int arg); -+ virtual int execute_command(string commandline); -+ virtual int execute_command(string command, double arg); -+ virtual int execute_command(string command, int arg); - virtual int execute_command(string command, unsigned long int &wait, bool trusted); - virtual int set_flag(string name, string value, bool &newval, bool trusted); - void update(int delta_time); -Index: stellarium-0.7.1/src/stel_ui.h -=================================================================== ---- stellarium-0.7.1.orig/src/stel_ui.h -+++ stellarium-0.7.1/src/stel_ui.h -@@ -316,7 +316,7 @@ private: - void tui_cb_sky_time(); // change effect parameters - - // Parse a file of type /usr/share/zoneinfo/zone.tab -- s_tui::MultiSet_item* stel_ui::create_tree_from_time_zone_file(const string& zonetab); -+ s_tui::MultiSet_item* create_tree_from_time_zone_file(const string& zonetab); - - bool ScriptDirectoryRead; - }; diff --git a/stellarium-0.8.2-x64.patch b/stellarium-0.8.2-x64.patch deleted file mode 100644 index b5a94dc..0000000 --- a/stellarium-0.8.2-x64.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- stellarium-0.8.2/src/translator.cpp.org 2006-10-15 21:14:08.000000000 +0200 -+++ stellarium-0.8.2/src/translator.cpp 2006-10-15 21:15:42.000000000 +0200 -@@ -73,9 +73,9 @@ - //change systemLangName to ISO 639 / ISO 3166. - unsigned int pos = Translator::systemLangName.find(':', 0); - if(pos != Translator::systemLangName.npos) -- Translator::systemLangName.resize(pos); -+ Translator::systemLangName.resize(pos+1); - pos = Translator::systemLangName.find('.', 0); -- if(pos == 5) Translator::systemLangName.resize(pos); -+ if(pos == 5) Translator::systemLangName.resize(pos+1); - } - - void Translator::reload() diff --git a/stellarium-0.8.2-x64_2.patch b/stellarium-0.8.2-x64_2.patch deleted file mode 100644 index 0889668..0000000 --- a/stellarium-0.8.2-x64_2.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- stellarium-0.8.2/src/stel_core.cpp~ 2006-11-13 23:06:16.000000000 +0100 -+++ stellarium-0.8.2/src/stel_core.cpp 2006-11-13 23:06:16.000000000 +0100 -@@ -70,8 +70,6 @@ - dataRoot = DATA_ROOT; - recordActionCallback = recordCallback; - -- projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60); -- glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW); - - tone_converter = new ToneReproductor(); - atmosphere = new Atmosphere(); -@@ -135,6 +133,10 @@ - // Load core data and initialize with default values - void StelCore::init(const InitParser& conf) - { -+ // do NOT do this in the constructor as there is no valid GLcontext there! -+ projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60); -+ glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW); -+ - baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf"); - - // Video Section diff --git a/stellarium-0.9.0-cmake.patch b/stellarium-0.9.0-cmake.patch new file mode 100644 index 0000000..3e31b36 --- /dev/null +++ b/stellarium-0.9.0-cmake.patch @@ -0,0 +1,13 @@ +--- 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") diff --git a/stellarium.spec b/stellarium.spec index fc00258..46af2ea 100644 --- a/stellarium.spec +++ b/stellarium.spec @@ -1,6 +1,6 @@ Name: stellarium -Version: 0.8.2 -Release: 5%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: Photo-realistic nightsky renderer Group: Amusements/Graphics @@ -8,9 +8,8 @@ License: GPL 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 +Source2: http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.9.0-1.pdf +Patch1: stellarium-0.9.0-cmake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,6 +22,8 @@ BuildRequires: mesa-libGLU-devel BuildRequires: ImageMagick BuildRequires: libpng-devel BuildRequires: freetype-devel +BuildRequires: cmake +BuildRequires: qt4-devel %description Stellarium is a real-time 3D photo-realistic nightsky renderer. It can @@ -42,12 +43,13 @@ You will need a PDF viewer to read the user guide. %prep %setup -q -%patch1 -p0 -%patch2 -p1 +%patch1 -p1 -b .cm %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 @@ -59,9 +61,6 @@ desktop-file-install \ --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,14 +78,15 @@ rm -rf $RPM_BUILD_ROOT %{_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 +* Tue Jun 12 2007 Jochen Schmitt 0.9.0-1 +- New upstream release + * Sun Dec 17 2006 Jochen Schmitt 0.8.2-5 - Resize icon to 32x32