rpms/supertux/FC-4 supertux.spec,1.8,1.9 supertux.desktop,1.1,NONE

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/extras/rpms/supertux/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12250

Modified Files:
	supertux.spec 
Removed Files:
	supertux.desktop 
Log Message:
Avoid second .desktop file (#167579)


Index: supertux.spec
===================================================================
RCS file: /cvs/extras/rpms/supertux/FC-4/supertux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- supertux.spec	1 Sep 2005 20:29:38 -0000	1.8
+++ supertux.spec	6 Sep 2005 16:23:53 -0000	1.9
@@ -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 @@
 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 @@
 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 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Sep 06 2005 Steven Pritchard <steve at kspei.com> 0.1.3-2
+- Avoid second .desktop file (#167579)
+
 * Thu Sep 01 2005 Steven Pritchard <steve at kspei.com> 0.1.3-1
 - Update to 0.1.3
 


--- supertux.desktop DELETED ---