SPECS: wormux.spec - use desktop file included in package (new pat...

[lisu]

Author: lisu                         Date: Sun Feb 11 14:13:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use desktop file included in package (new patch added)
- use new icon included in package

---- Files affected:
SPECS:
   wormux.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/wormux.spec
diff -u SPECS/wormux.spec:1.36 SPECS/wormux.spec:1.37
--- SPECS/wormux.spec:1.36	Fri Feb  9 13:48:26 2007
+++ SPECS/wormux.spec	Sun Feb 11 15:13:50 2007
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - use desktop file included in source ( %{_datadir}/games/wormux/wormux.desktop )
-# - use new icon from %{_datadir}/games/wormux/ instead of outdated Source2 
-#
 Summary:	A free (libre) clone of Worms from Team17
 Summary(de):	Ein kostenloser Team17 Worms-Klon
 Summary(pl):	Wolnodostępny klon Worms z Team17
@@ -13,9 +9,8 @@
 Group:		Applications/Games
 Source0:	http://download.gna.org/wormux/%{name}-%{version}.tar.gz
 # Source0-md5:	d921ae5bad243dec7bb6825d6e0b9d16
-Source1:	%{name}.desktop
-Source2:	%{name}.png
 Patch0:		%{name}-disable-werror.patch
+Patch1:		%{name}-desktop.patch
 URL:		http://www.wormux.org/en/index.php
 BuildRequires:	SDL-devel >= 1.2.6
 BuildRequires:	SDL_gfx-devel >= 2.0.13
@@ -44,6 +39,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # let *.mo build
 rm -f po/stamp-po
@@ -64,8 +60,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install data/wormux.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install data/wormux_32x32.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/pt{-BR,_BR}
 
@@ -80,7 +76,7 @@
 %attr(755,root,root) %{_bindir}/wormux
 %{_datadir}/games/%{name}
 %{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/*.png
+%{_pixmapsdir}/%{name}.xpm
 %{_mandir}/man6/wormux.6*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -89,6 +85,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2007/02/11 14:13:50  lisu
+- use desktop file included in package (new patch added)
+- use new icon included in package
+
 Revision 1.36  2007/02/09 12:48:26  megabajt
 - BR: curl-devel
 - fixed location of pt_BR locale
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wormux.spec?r1=1.36&r2=1.37&f=u