From 9eebc31fd677020debc75436fb8d552541b8b0e2 Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Sep 06 2005 16:23:37 +0000
Subject: Avoid second .desktop file (#167579)


---

diff --git a/supertux.desktop b/supertux.desktop
deleted file mode 100644
index 5081f77..0000000
--- a/supertux.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=SuperTux
-Comment=A 2D jump'n'run game similar to Mario Bros
-Exec=supertux
-Icon=supertux.xpm
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;ArcadeGame;
diff --git a/supertux.spec b/supertux.spec
index 3bf896c..1e9f22b 100644
--- a/supertux.spec
+++ b/supertux.spec
@@ -1,6 +1,6 @@
 Name:           supertux
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Jump'n run like game similar to Mario Bros
 
@@ -8,7 +8,6 @@ Group:          Amusements/Games
 License:        GPL
 URL:            http://supertux.berlios.de/
 Source0:        http://download.berlios.de/supertux/supertux-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_mixer-devel
@@ -35,12 +34,11 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/{pixmaps,applications}
-install -m 644 data/images/icon.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/supertux.xpm
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/supertux.desktop
 desktop-file-install \
 	--vendor fedora \
 	--add-category X-Fedora \
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications supertux.desktop
 	
 
 %clean
@@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard <steve@kspei.com> 0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard <steve@kspei.com> 0.1.3-1
 - Update to 0.1.3