[stellarium/f18] New upstream release

[Jochen Schmitt]

commit 8c8e4740956e7f8b9f392dfaaf08de5bae647906
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sun Feb 3 16:55:55 2013 +0100

    New upstream release
    
    - clean up SPEC file

 .gitignore      |    1 +
 sources         |    2 +-
 stellarium.spec |   22 +++++++++-------------
 3 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d708db5..22ac022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ stellarium_user_guide-0.10.2-1.pdf
 /stellarium-0.11.2.tar.gz
 /stellarium-0.11.3.tar.gz
 /stellarium-0.11.4a.tar.gz
+/stellarium-0.12.0.tar.gz
diff --git a/sources b/sources
index c132313..ede244d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0ad79f6188fc393b936d37d50054e5ab  stellarium-0.11.4a.tar.gz
+1bcff9abc5eb8acd56acd13211fb1a0b  stellarium-0.12.0.tar.gz
 8da17ee33510f57cbfdb321d8ae43c59  stellarium_user_guide-0.10.2-1.pdf
diff --git a/stellarium.spec b/stellarium.spec
index 8e6db88..83204d4 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -1,8 +1,8 @@
-%define guidever 0.10.2-1
+%global guidever 0.10.2-1
 
 Name:           stellarium
 
-Version:        0.11.4a
+Version:        0.12.0
 Release:        1%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
@@ -13,8 +13,6 @@ Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version
 Source1:        stellarium.desktop
 Source2:        http://downloads.sourceforge.net/stellarium/stellarium_user_guide-%{guidever}.pdf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  mesa-libGLU-devel
@@ -54,17 +52,15 @@ contains everythings you want to know about Stellarium.
 You will need a PDF viewer to read the user guide.
 
 %prep
-%setup -q -n stellarium-0.11.4
+%setup -q
 
 %build
 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
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{_bindir}/install -c -p"
 
 # Remove unwanted files
@@ -78,8 +74,7 @@ desktop-file-install                            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 
-install -m 0644 -p stellarium.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.png
-cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-0.11.4
+cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
 
@@ -87,9 +82,6 @@ ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
 %find_lang %{name}-skycultures
 cat %{name}-skycultures.lang >>%{name}.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README 
@@ -97,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/stellarium-wrapper
 %{_datadir}/%{name}
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/stellarium.png
 %{_mandir}/man1/stellarium.1.gz
 
 %files doc
@@ -105,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Sun Feb  3 2013 Jochen Schmitt <Jochen herr-schmitt de> - 0.12.0-1
+- New upstream release
+- clean up SPEC file
+
 * Mon Aug 27 2012 Jochen Schmitt <JOchen her-schmitt de> - 0.11.4a-1
 - New upstream release