rpms/xorg-x11-drv-nvidia/F-20 xorg-x11-drv-nvidia.spec,1.137,1.138

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13845

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
* Tue Jan 27 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:331.113-2
- add conflicts 340xx



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-20/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- xorg-x11-drv-nvidia.spec	20 Dec 2014 09:39:58 -0000	1.137
+++ xorg-x11-drv-nvidia.spec	27 Jan 2015 11:52:48 -0000	1.138
@@ -8,7 +8,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         331.113
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -60,6 +60,7 @@
 Conflicts:       xorg-x11-drv-nvidia-96xx
 Conflicts:       xorg-x11-drv-nvidia-173xx
 Conflicts:       xorg-x11-drv-nvidia-304xx
+Conflicts:       xorg-x11-drv-nvidia-340xx
 Conflicts:       xorg-x11-drv-fglrx
 Conflicts:       xorg-x11-drv-catalyst
 
@@ -466,6 +467,9 @@
 %{_nvidia_libdir}/libnvidia-ml.so
 
 %changelog
+* Tue Jan 27 2015 Leigh Scott <leigh123linux at googlemail.com> - 1:331.113-2
+- add conflicts 340xx
+
 * Sat Dec 20 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:331.113-1
 - Update to 331.113