packages: xbmc/xbmc.spec - nasm not required on x86_&4 - added .desktop and...

[sparky]

Author: sparky                       Date: Fri Jan  1 16:19:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- nasm not required on x86_&4
- added .desktop and icon

---- Files affected:
packages/xbmc:
   xbmc.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/xbmc/xbmc.spec
diff -u packages/xbmc/xbmc.spec:1.12 packages/xbmc/xbmc.spec:1.13
--- packages/xbmc/xbmc.spec:1.12	Fri Jan  1 16:50:37 2010
+++ packages/xbmc/xbmc.spec	Fri Jan  1 17:19:50 2010
@@ -2,7 +2,7 @@
 #
 # TODO:
 #  - fix build flags - some files are compiled with -O3 and without rpm*flags
-#  - fix linking order
+#  - fix linking argument order
 #  - fix install - add DESTDIR support
 #  - don't put binary in %{_datadir} and fix start scripts
 #
@@ -12,7 +12,7 @@
 Release:	0.1
 License:	GPL v3
 Group:		Applications/Multimedia
-Source0:	http://downloads.sourceforge.net/project/xbmc/XBMC%20Source%20Code/Camelot%20-%209.11/xbmc-9.11.tar.gz
+Source0:	http://downloads.sourceforge.net/project/xbmc/XBMC%20Source%20Code/Camelot%20-%209.11/%{name}-%{version}.tar.gz
 # Source0-md5:	9a68ac1e2f44a54cc3803fcdb1265767
 URL:		http://xbmc.org
 Patch0:		%{name}-nobash.patch
@@ -61,7 +61,9 @@
 BuildRequires:	libvorbis-devel
 BuildRequires:	lzo-devel
 BuildRequires:	mysql-devel
+%ifarch %{ix86}
 BuildRequires:	nasm
+%endif
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
@@ -85,7 +87,7 @@
 %description
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 
 %build
@@ -112,6 +114,8 @@
 %{_datadir}/%{name}
 %attr(755,root,root) %{_datadir}/%{name}/xbmc.bin
 %attr(755,root,root) %{_datadir}/%{name}/xbmc-xrandr
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 %{_datadir}/xsessions/XBMC.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -121,6 +125,10 @@
 
 
 $Log$
+Revision 1.13  2010/01/01 16:19:50  sparky
+- nasm not required on x86_&4
+- added .desktop and icon
+
 Revision 1.12  2010/01/01 15:50:37  wiget
 - started update to final 9.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xbmc/xbmc.spec?r1=1.12&r2=1.13&f=u