[stellarium/el6] Remove duplicate desktop file

Jochen Schmitt s4504kr at fedoraproject.org
Fri Jun 8 15:58:39 UTC 2012


commit bf3b33d62bdb549989b5efb9e1d9630f013d363a
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Fri Jun 8 17:18:51 2012 +0200

    Remove duplicate desktop file

 stellarium.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/stellarium.spec b/stellarium.spec
index 6547c4e..71c9346 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -3,7 +3,7 @@
 Name:           stellarium
 
 Version:        0.11.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -65,18 +65,18 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{_bindir}/install -c -p"
 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
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/stellarium.desktop
 
 desktop-file-install                            \
   --vendor fedora                               \
   --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-%{version}
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/stellarium-wrapper
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/stellarium/data/*.ttf
-
 %find_lang %{name}
 %find_lang %{name}-skycultures
 cat %{name}-skycultures.lang >>%{name}.lang
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-%{guidever}.pdf
 
 %changelog
+* Fri Jun  8 2012 Jochen Schmitt <Jochen herr-schmitt de> 0.11.3-2
+- Remove duplicate desktop file
+
 * Mon Jun  4 2012 Jochen Schmitt <Jochen herr-schmitt de> 0.11.3-1
 - New upstream release
 


More information about the scm-commits mailing list