SPECS: meritous.spec - .desktop, icon - typo

[lisu]

Author: lisu                         Date: Wed Dec  3 15:42:04 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- .desktop, icon
- typo

---- Files affected:
SPECS:
   meritous.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/meritous.spec
diff -u SPECS/meritous.spec:1.1 SPECS/meritous.spec:1.2
--- SPECS/meritous.spec:1.1	Wed Dec  3 14:41:15 2008
+++ SPECS/meritous.spec	Wed Dec  3 16:41:59 2008
@@ -11,6 +11,7 @@
 Group:		X11/Applications/Games
 Source0:	http://www.asceai.net/files/%{name}_%{src_ver}_src.tar.bz2
 # Source0-md5:	88e439c773ee0e334fd2b256100983b8
+Source1:	%{name}.desktop
 URL:		http://www.asceai.net/meritous/
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
@@ -28,7 +29,7 @@
 %setup -q -n %{name}_%{src_ver}_src
 %{__sed} -i -e 's at gcc@\$(CC)@g' Makefile
 
-# chane path to data files (manual installation)
+# change path to data files (manual installation)
 find . -name '*.c' -exec %{__sed} -i -e 's at dat/@%{_datadir}/%{name}/dat/@g' {} \;
 
 %build
@@ -39,9 +40,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir},%{_pixmapsdir}}
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{name} $RPM_BUILD_ROOT%{_bindir}
+install dat/i/icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 cp -r dat $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
@@ -52,6 +55,8 @@
 %doc dat/d/helpfile.txt readme.txt
 %attr(755,root,root) %{_bindir}/%{name}
 %{_datadir}/%{name}
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -59,6 +64,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008/12/03 15:41:59  lisu
+- .desktop, icon
+- typo
+
 Revision 1.1  2008/12/03 13:41:15  lisu
 - new
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/meritous.spec?r1=1.1&r2=1.2&f=u