Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3193 Modified Files: xorg-x11-drv-nvidia.spec Log Message: Fix Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- xorg-x11-drv-nvidia.spec 19 Jul 2013 15:37:40 -0000 1.109 +++ xorg-x11-drv-nvidia.spec 21 Jul 2013 14:56:02 -0000 1.110 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 319.32 -Release: 6%{?dist} +Release: 7%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -29,12 +29,12 @@ ExclusiveArch: i686 x86_64 armv7hl -Obsoletes: nvidia-xconfig < 1.0-30 -Provides: nvidia-xconfig = %{version}-%{release} -Obsoletes: nvidia-settings < 1.0-34 -Provides: nvidia-settings = %{version}-%{release} -Obsoletes: nvidia-settings-desktop < 1.0-34 -Provides: nvidia-settings-desktop = %{version}-%{release} +#Obsoletes: nvidia-xconfig < 1.0-30 +#Provides: nvidia-xconfig = %{version}-%{release} +#Obsoletes: nvidia-settings < 1.0-34 +#Provides: nvidia-settings = %{version}-%{release} +#Obsoletes: nvidia-settings-desktop < 1.0-34 +#Provides: nvidia-settings-desktop = %{version}-%{release} Provides: nvidia-modprobe = %{version}-%{release} Provides: nvidia-persistenced = %{version}-%{release} @@ -399,6 +399,9 @@ %changelog +* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:319.32-7 +- Disable Obsoletes/Provides of nvidia tools until rhbz#985944 + * Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:319.32-6 - Fix typo with libGLcore filter