[stellarium/el6] New upstream release

[Jochen Schmitt]

commit 69fe87aeaa5f6fac85056a11d9f576500df1c0ea
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Jun 4 21:16:39 2012 +0200

    New upstream release

 .gitignore      |    4 ++++
 sources         |    2 ++
 stellarium.spec |   32 +++++++++++++++++++++++++-------
 3 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9021fba..977ca5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 stellarium-0.10.2.tar.gz
 stellarium_user_guide-0.10.2-1.pdf
 /stellarium-0.11.1.tar.gz
+<<<<<<< HEAD
+=======
+/stellarium-0.11.2.tar.gz
+>>>>>>> ab9101c... New upstream release
 /stellarium-0.11.3.tar.gz
diff --git a/sources b/sources
index e0b758f..f00193b 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 545fbfbc6eca51f7e145e99a21f773f4  stellarium-0.11.3.tar.gz
+8da17ee33510f57cbfdb321d8ae43c59  stellarium_user_guide-0.10.2-1.pdf
+
diff --git a/stellarium.spec b/stellarium.spec
index 683e656..6547c4e 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -61,13 +61,16 @@ convert -size 32x32 data/icon.bmp stellarium.png
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{_bindir}/install -c -p"
 
+# Remove unwanted files
+rm -f $RPM_BUILD_ROOT%{_datadir}/stellarium/data/*.ttf
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/stellarium.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/stellarium/data/stellarium.ico
+
 desktop-file-install                            \
   --vendor fedora                               \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{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/stellarium.ico
 cp %{SOURCE2} $RPM_BUILD_DIR/stellarium-%{version}
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
@@ -96,14 +99,29 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
-* Tue Jun  5 2012 Jochen Schmitt <Jochen herr-schmitt de> 0.11.3-1
+* Mon Jun  4 2012 Jochen Schmitt <Jochen herr-schmitt de> 0.11.3-1
+- New upstream release
+
+* Tue Mar 13 2012 Jochen Schmitt <Jochen herr-schmitt de> 0.11.2-1
 - New upstream release
 
-* Mon Nov 28 2011 Jochen Schmitt <Jochen herr-schmitt de> 0.11.1-2
-- Initial package for EPEL-6
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-3
+- Rebuilt for c++ ABI breakage
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Mon Dec 13 2010 Jochen Schmitt <JOchen herr-schmitt de> 0.10.5-2
-- Fix dejavu-fonts dep issue (#662520)
+* Tue Nov  8 2011 Jochen Schmitt <Jochen herr-schmitt de> 0.11.1-1
+- New upstream release
+
+* Tue Jul  5 2011 Jochen Schmitt <Jochen herr-schmitt de> 0.11.0-1
+- New upstream release
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec  6 2010 Jochen Schmitt <Jochen herr-schmitt de> 0.10.6-1
+- New upstream release
 
 * Thu Jun  3 2010 Jochen Schmitt <Jochen herr-schmitt de> 0.10.5-1
 - Nrw upstream release