packages: libvdpau/libvdpau.spec - versioned nvidia conflicts: 1:190.42-2 a...

[sparky]

Author: sparky                       Date: Sun Nov 15 00:13:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- versioned nvidia conflicts: 1:190.42-2 and above have libvdpau libraries removed

---- Files affected:
packages/libvdpau:
   libvdpau.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/libvdpau/libvdpau.spec
diff -u packages/libvdpau/libvdpau.spec:1.5 packages/libvdpau/libvdpau.spec:1.6
--- packages/libvdpau/libvdpau.spec:1.5	Sun Nov 15 01:04:52 2009
+++ packages/libvdpau/libvdpau.spec	Sun Nov 15 01:13:09 2009
@@ -17,7 +17,7 @@
 BuildRequires:	xorg-lib-libX11-devel
 # libvdpau isn't arch-specific, but currently only nvidia driver is available
 # (xorg-driver-video-nvidia.spec)
-Conflicts:	xorg-driver-video-nvidia-libs
+Conflicts:	xorg-driver-video-nvidia-libs < 1:190.42-2
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -106,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/11/15 00:13:09  sparky
+- versioned nvidia conflicts: 1:190.42-2 and above have libvdpau libraries removed
+
 Revision 1.5  2009/11/15 00:04:52  w.kier
 - adapterized
 
================================================================

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