rpms/xorg-x11-drv-nvidia/F-13 xorg-x11-drv-nvidia.spec,1.39,1.40

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
Fix for 1262



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-drv-nvidia.spec	21 Jun 2010 10:28:10 -0000	1.39
+++ xorg-x11-drv-nvidia.spec	8 Jul 2010 18:54:53 -0000	1.40
@@ -9,7 +9,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         195.36.31
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -281,11 +281,11 @@
 fi
 if [ -x /sbin/grubby ] ; then
   GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
-  /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nomodeset rdblacklist=nouveau' &>/dev/null
+  /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
 fi
 if [ -x /usr/sbin/setsebool ] ; then
-  SELINUXEXECSTACK=`grep 0 /selinux/booleans/allow_execstack | wc -l`
-  if [ ${SELINUXEXECSTACK} -eq "1" ] ; then
+  SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
+  if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
     /usr/sbin/setsebool -P allow_execstack on &>/dev/null
   fi
 fi ||:
@@ -359,6 +359,9 @@
 
 
 %changelog
+* Thu Jul 08 2010 Nicolas Chauvet <kwizart at gmail.com> - 1:195.36.31-2
+- Improve post script as reported in rfbz#1262
+
 * Wed Jun 16 2010 Nicolas Chauvet <kwizart at gmail.com> - 1:195.36.31-1
 - Update to 195.36.31
 - Add post section to change boot option with grubby