Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14633/devel Modified Files: .cvsignore sources xorg-x11-drv-nvidia.spec Log Message: Update to 180.51 (stable) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 9 Mar 2009 23:11:23 -0000 1.12 +++ .cvsignore 22 Apr 2009 07:52:59 -0000 1.13 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86-180.37-pkg0.run -NVIDIA-Linux-x86_64-180.37-pkg0.run +NVIDIA-Linux-x86-180.51-pkg0.run +NVIDIA-Linux-x86_64-180.51-pkg0.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 9 Mar 2009 23:11:23 -0000 1.12 +++ sources 22 Apr 2009 07:52:59 -0000 1.13 @@ -1,2 +1,2 @@ -ace799a4c119d02ddc6aeed28d598ab3 NVIDIA-Linux-x86-180.37-pkg0.run -2fc28871c7a89de60dc42240d3ec7231 NVIDIA-Linux-x86_64-180.37-pkg0.run +871fb27da348c71e4a97a158af80f9dd NVIDIA-Linux-x86-180.51-pkg0.run +28882531c762f5a8690b658e7e3e410f NVIDIA-Linux-x86_64-180.51-pkg0.run 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xorg-x11-drv-nvidia.spec 3 Apr 2009 19:51:21 -0000 1.21 +++ xorg-x11-drv-nvidia.spec 22 Apr 2009 07:52:59 -0000 1.22 @@ -7,8 +7,8 @@ %endif Name: xorg-x11-drv-nvidia -Version: 180.37 -Release: 3%{?dist} +Version: 180.51 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -48,10 +48,13 @@ Requires(preun): chkconfig Provides: nvidia-kmod-common = %{version} +Conflicts: xorg-x11-drv-nvidia-beta Conflicts: xorg-x11-drv-nvidia-legacy +Conflicts: xorg-x11-drv-nvidia-71xx Conflicts: xorg-x11-drv-nvidia-96xx Conflicts: xorg-x11-drv-nvidia-173xx Conflicts: xorg-x11-drv-fglrx +Conflicts: xorg-x11-drv-catalyst Obsoletes: nvidia-kmod < %{version} #Introduced in F10 for freshrpms compatibility @@ -60,9 +63,6 @@ #Introduced in F10 when 173xx has forked to legacy serie Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100 Provides: xorg-x11-drv-nvidia-newest = %{version}-101 -#Introduced in F11 when opengl 3.0 beta has merged back -Obsoletes: xorg-x11-drv-nvidia-beta < 180.35-100 -Provides: xorg-x11-drv-nvidia-beta = 180.35-101 %description @@ -81,9 +81,6 @@ #Introduced in F10 when 173xx has forked to legacy serie Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100 Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101 -#Introduced in F11 when opengl 3.0 beta has merged back -Obsoletes: xorg-x11-drv-nvidia-beta-devel < 180.35-100 -Provides: xorg-x11-drv-nvidia-beta-devel = 180.35-101 %description devel This package provides the development files of the %{name} package, @@ -103,9 +100,6 @@ #Introduced in F10 when 173xx has forked to legacy serie Obsoletes: xorg-x11-drv-nvidia-newest-libs < %{version}-100 Provides: xorg-x11-drv-nvidia-newest-libs = %{version}-101 -#Introduced in F11 when opengl 3.0 beta has merged back -Obsoletes: xorg-x11-drv-nvidia-beta-libs < 180.35-100 -Provides: xorg-x11-drv-nvidia-beta-libs = 180.35-101 %description libs This package provides the shared libraries for %{name}. @@ -310,6 +304,11 @@ %changelog +* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1 +- Update to 180.51 (stable) +- Add 71xx/beta/catalyst Conflicts +- Don't Obsoletes the beta serie anymore (only the newest) + * Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 180.37-3 - Fix x86 Arch for fedora >= 11