packages: xbmc/xbmc.spec - vocabulary, added nvidia Conflicts (as described...

[w.kier]

Author: w.kier                       Date: Tue Dec 28 18:27:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- vocabulary, added nvidia Conflicts (as described in TODO)

---- Files affected:
packages/xbmc:
   xbmc.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/xbmc/xbmc.spec
diff -u packages/xbmc/xbmc.spec:1.18 packages/xbmc/xbmc.spec:1.19
--- packages/xbmc/xbmc.spec:1.18	Wed Dec 22 21:58:39 2010
+++ packages/xbmc/xbmc.spec	Tue Dec 28 19:27:33 2010
@@ -3,10 +3,11 @@
 # TODO:
 #  - fix build flags - some files are compiled with -O3 and without rpm*flags
 #  - fix linking argument order
-#  - fix nvidia vs. libXrandr >= 1.2 conflict (nvidia drivers still supports 
-#    only libXrandr 1.1 - with no gamma support)
+#  - fix nvidia vs. libXrandr >= 1.2 conflict (nvidia drivers still supports
+#    only libXrandr 1.1 - with no gamma support; it causes application crash
+#    on XRRSetCrtcGamma function called by SDL_SetVideoMode)
 #  - add and/or fix users/groups permissions
-#  - didvide to subpackages?
+#  - split to subpackages?
 #  - check how it works with external python libraries
 #
 # Conditional build:
@@ -22,7 +23,7 @@
 # Source0-md5:	728fb514e5f43f27bb880305061b4e72
 URL:		http://xbmc.org
 Patch0:		%{name}-nobash.patch
-Patch1:         %{name}-python27.patch
+Patch1:		%{name}-python27.patch
 Patch2:		%{name}-libpng14.patch
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
@@ -46,7 +47,7 @@
 BuildRequires:	freetype-devel
 BuildRequires:	fribidi-devel
 BuildRequires:	gawk
-BuildRequires:  gettext-autopoint
+BuildRequires:	gettext-autopoint
 BuildRequires:	gettext-devel
 BuildRequires:	glew-devel
 BuildRequires:	gperf
@@ -58,9 +59,9 @@
 BuildRequires:	libdts-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmad-devel
-BuildRequires:  libmicrohttpd-devel
-BuildRequires:  libmodplug-devel
+BuildRequires:	libmicrohttpd-devel
 BuildRequires:	libmms-devel
+BuildRequires:	libmodplug-devel
 BuildRequires:	libmpeg2-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libpng-devel
@@ -76,7 +77,7 @@
 BuildRequires:	nasm
 %endif
 BuildRequires:	openssl-devel
-BuildRequires:  pcre-cxx-devel
+BuildRequires:	pcre-cxx-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
 BuildRequires:	python-devel
@@ -92,9 +93,10 @@
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	zip
 BuildRequires:	zlib-devel
+Requires:	/usr/bin/glxinfo
 Requires:	lsb-release
 Requires:	xorg-app-xdpyinfo
-Requires:	/usr/bin/glxinfo
+Conflicts:	xorg-driver-video-nvidia <= 260.19.29
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -144,6 +146,9 @@
 
 
 $Log$
+Revision 1.19  2010/12/28 18:27:33  w.kier
+- vocabulary, added nvidia Conflicts (as described in TODO)
+
 Revision 1.18  2010/12/22 20:58:39  w.kier
 - BR enca
 
================================================================

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