rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.144,1.145
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21092
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Conflicts 340xx for -cuda
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- xorg-x11-drv-nvidia.spec 16 Aug 2014 14:10:37 -0000 1.144
+++ xorg-x11-drv-nvidia.spec 16 Aug 2014 14:11:42 -0000 1.145
@@ -103,6 +103,8 @@
Provides: nvidia-modprobe = %{version}-%{release}
Provides: nvidia-persistenced = %{version}-%{release}
+Conflicts: xorg-x11-drv-nvidia-340xx-cuda
+
#Don't put an epoch here
Provides: cuda-drivers = %{version}