rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.69,1.70

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11456

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
Resync with devel



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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xorg-x11-drv-nvidia.spec	9 Nov 2011 14:25:33 -0000	1.69
+++ xorg-x11-drv-nvidia.spec	10 Nov 2011 20:35:19 -0000	1.70
@@ -7,7 +7,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         290.06
-Release:         1%{?dist}
+Release:         2%{?dist}.1
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -264,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 || :
 
@@ -285,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
@@ -349,6 +349,9 @@
 
 
 %changelog
+* Thu Nov 10 2011 Nicolas Chauvet <kwizart at gmail.com> - 1:290.06-2
+- Switch to rd.driver.blacklist from the deprecated rdblacklist on install
+
 * Wed Nov 09 2011 Nicolas Chauvet <kwizart at gmail.com> - 1:290.06-1
 - Update to 290.06 beta