Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13616 Modified Files: sources .cvsignore xorg-x11-drv-nvidia.spec Log Message: Update to 290.06 Use rd.driver.blacklist Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 4 Oct 2011 09:49:15 -0000 1.37 +++ sources 10 Nov 2011 13:49:59 -0000 1.38 @@ -1,2 +1,2 @@ -2d469a90abef50320f548cfa8085e3a0 NVIDIA-Linux-x86-285.05.09.run -4d645c795817284296bfcc644b0c9fd2 NVIDIA-Linux-x86_64-285.05.09.run +e7d718a8f2bbfdd1a479e2e01db84240 NVIDIA-Linux-x86-290.06.run +860b8366378ff68760fff9512fd309eb NVIDIA-Linux-x86_64-290.06.run Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 4 Oct 2011 09:49:15 -0000 1.37 +++ .cvsignore 10 Nov 2011 13:49:59 -0000 1.38 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86-285.05.09.run -NVIDIA-Linux-x86_64-285.05.09.run +NVIDIA-Linux-x86-290.06.run +NVIDIA-Linux-x86_64-290.06.run Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- xorg-x11-drv-nvidia.spec 4 Oct 2011 09:49:15 -0000 1.68 +++ xorg-x11-drv-nvidia.spec 10 Nov 2011 13:49:59 -0000 1.69 @@ -6,8 +6,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 285.05.09 -Release: 1%{?dist} +Version: 290.06 +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -50,6 +50,11 @@ Requires(post): ldconfig #Requires(preun): chkconfig +%if 0%{?fedora} == 16 +Conflicts: selinux-policy-targeted < 3.10.0-53 +%endif + + Provides: nvidia-kmod-common = %{?epoch}:%{version} Conflicts: xorg-x11-drv-nvidia-beta @@ -259,7 +264,7 @@ #/etc/init.d/nvidia start &>/dev/null ||: if [ -x /sbin/grubby ] ; then GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` - /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null + /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' &>/dev/null fi fi || : @@ -280,7 +285,7 @@ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*` for kernel in ${KERNELS} ; do /sbin/grubby --update-kernel=${kernel} \ - --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null + --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset' &>/dev/null done fi #Backup and disable previously used xorg.conf @@ -344,6 +349,12 @@ %changelog +* Thu Nov 10 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:290.06-2 +- Switch to rd.driver.blacklist from the deprecated rdblacklist on install + +* Wed Nov 09 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:290.06-1 +- Update to 290.06 beta + * Tue Oct 04 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:285.05.09-1 - Update to 285.05.09