rpms/stellarium/devel stellarium-0.9.0-cmake.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.11, 1.12 stellarium.spec, 1.27, 1.28 stellarium-0.7.1-gcc41.patch, 1.1, NONE stellarium-0.8.2-x64.patch, 1.1, NONE stellarium-0.8.2-x64_2.patch, 1.1, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Tue Jun 12 20:22:07 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19940
Modified Files:
.cvsignore sources stellarium.spec
Added Files:
stellarium-0.9.0-cmake.patch
Removed Files:
stellarium-0.7.1-gcc41.patch stellarium-0.8.2-x64.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")
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 31 May 2006 19:52:26 -0000 1.9
+++ .cvsignore 12 Jun 2007 20:21:05 -0000 1.10
@@ -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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/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 Jun 2007 20:21:05 -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/devel/stellarium.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- stellarium.spec 18 Dec 2006 16:34:26 -0000 1.27
+++ stellarium.spec 12 Jun 2007 20:21:05 -0000 1.28
@@ -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 @@
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: 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 @@
%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 @@
--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 @@
%{_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 <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-x64.patch DELETED ---
--- stellarium-0.8.2-x64_2.patch DELETED ---
More information about the scm-commits
mailing list