packages: libvdpau/libvdpau.spec - Conflict for xorg-driver-video-nvidia-li...

[w.kier]

Author: w.kier                       Date: Sun Nov 15 00:02:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Conflict for xorg-driver-video-nvidia-libs added

---- Files affected:
packages/libvdpau:
   libvdpau.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/libvdpau/libvdpau.spec
diff -u packages/libvdpau/libvdpau.spec:1.3 packages/libvdpau/libvdpau.spec:1.4
--- packages/libvdpau/libvdpau.spec:1.3	Sat Oct 24 10:09:56 2009
+++ packages/libvdpau/libvdpau.spec	Sun Nov 15 01:02:04 2009
@@ -19,6 +19,7 @@
 # (xorg-driver-video-nvidia.spec)
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Conflicts:	xorg-driver-video-nvidia-libs
 
 %description
 VDPAU is the Video Decode and Presentation API for UNIX. It provides
@@ -105,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/11/15 00:02:04  w.kier
+- Conflict for xorg-driver-video-nvidia-libs added
+
 Revision 1.3  2009/10/24 08:09:56  qboosh
 - moved libvdpau_trace plugin to base
 - release 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvdpau/libvdpau.spec?r1=1.3&r2=1.4&f=u