SPECS: globulation2.spec - use only one .desktop file (included wi...

[lisu]

Author: lisu                         Date: Thu Sep 28 15:24:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use only one .desktop file (included with project)
- globulation2-desktop.patch added
- rel 2

---- Files affected:
SPECS:
   globulation2.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/globulation2.spec
diff -u SPECS/globulation2.spec:1.25 SPECS/globulation2.spec:1.26
--- SPECS/globulation2.spec:1.25	Mon Sep  4 22:03:04 2006
+++ SPECS/globulation2.spec	Thu Sep 28 17:23:56 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Glob2 - gra Strategii Czasu Rzeczywistego będąca sztuką przez duże "S"
 Name:		globulation2
 Version:	0.8.21
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL
 Group:		Applications/Games
@@ -14,9 +14,8 @@
 # Source1-md5:	8e4516243ecaa76fa12d700f4a93e708
 Source2:	http://goldeneye.sked.ch/~smagnena/sans.ttf
 # Source2-md5:	48d9e359be3689eac14ef788a3bb1aa0
-Source3:	%{name}.desktop
-Source4:	%{name}.png
 Patch0:		%{name}-default_lang.patch
+Patch1:		%{name}-desktop.patch
 URL:		http://globulation2.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL_image-devel
@@ -68,6 +67,7 @@
 %prep
 %setup -q -n glob2-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
@@ -84,15 +84,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 tar -C $RPM_BUILD_ROOT%{_datadir}/glob2/data -xf %{SOURCE1}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/glob2/data/fonts
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +108,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/09/28 15:23:56  lisu
+- use only one .desktop file (included with project)
+- globulation2-desktop.patch added
+- rel 2
+
 Revision 1.25  2006/09/04 20:03:04  matkor
 - BR: boost-ref-devel added.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/globulation2.spec?r1=1.25&r2=1.26&f=u