rpms/xorg-x11-drv-nvidia-304xx/F-17 xorg-x11-drv-nvidia-304xx.spec, 1.7, 1.8

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3351/F-17

Modified Files:
	xorg-x11-drv-nvidia-304xx.spec 
Log Message:
Fix



Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-nvidia-304xx.spec	18 Jul 2013 07:50:48 -0000	1.7
+++ xorg-x11-drv-nvidia-304xx.spec	21 Jul 2013 14:57:23 -0000	1.8
@@ -7,7 +7,7 @@
 
 Name:            xorg-x11-drv-nvidia-304xx
 Version:         304.88
-Release:         11%{?dist}
+Release:         12%{?dist}
 Summary:         NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -28,11 +28,11 @@
 %else
 ExclusiveArch: i386 x86_64
 %endif
-Obsoletes:  nvidia-xconfig < 1.0-30
+#Obsoletes:  nvidia-xconfig < 1.0-30
 #Provides:  nvidia-xconfig = %{version}-%{release}
-Obsoletes:  nvidia-settings < 1.0-34
+#Obsoletes:  nvidia-settings < 1.0-34
 #Provides:  nvidia-settings = %{version}-%{release}
-Obsoletes:  nvidia-settings-desktop < 1.0-34
+#Obsoletes:  nvidia-settings-desktop < 1.0-34
 #Provides:  nvidia-settings-desktop = %{version}-%{release}
 
 Requires:        which
@@ -388,6 +388,9 @@
 
 
 %changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart at gmail.com> - 304.88-12
+- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
+
 * Mon Jul 15 2013 Nicolas Chauvet <kwizart at gmail.com> - 304.88-11
 - Fix typo with libGLcore filter
 - Avoid a Virtual Provides for legacy series