rpms/xorg-x11-drv-nvidia-96xx/F-12 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 nvidia-96xx-config-display, 1.3, 1.4 xorg-x11-drv-nvidia-96xx.spec, 1.18, 1.19

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14346

Modified Files:
	.cvsignore sources nvidia-96xx-config-display 
	xorg-x11-drv-nvidia-96xx.spec 
Log Message:
- Update to 96.43.18
- Fallback to nouveau instead of nv
- Add post section to change boot option with grubby
- Add post section Enabled Selinux allow_execstack boolean.



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Mar 2010 11:00:42 -0000	1.6
+++ .cvsignore	14 Aug 2010 18:58:30 -0000	1.7
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-96.43.16-pkg0.run
-NVIDIA-Linux-x86_64-96.43.16-pkg0.run
+NVIDIA-Linux-x86_64-96.43.18-pkg0.run
+NVIDIA-Linux-x86-96.43.18-pkg0.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Mar 2010 11:00:42 -0000	1.6
+++ sources	14 Aug 2010 18:58:30 -0000	1.7
@@ -1,2 +1,2 @@
-7479b25c747e29af95b9ccf06f43fbf9  NVIDIA-Linux-x86-96.43.16-pkg0.run
-73e226d4ee0996b6df4bdf44cc1fc6f5  NVIDIA-Linux-x86_64-96.43.16-pkg0.run
+10105692a6578862221a97e24267a9e4  NVIDIA-Linux-x86_64-96.43.18-pkg0.run
+f19041ded11947c54ac9f31dc1496e3b  NVIDIA-Linux-x86-96.43.18-pkg0.run


Index: nvidia-96xx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12/nvidia-96xx-config-display,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-96xx-config-display	14 Nov 2009 21:34:55 -0000	1.3
+++ nvidia-96xx-config-display	14 Aug 2010 18:58:30 -0000	1.4
@@ -94,9 +94,9 @@
         prevDriver = self.config.getOldDriver()
         if prevDriver == self.majorVendor:
             print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
-            print _('Using the \'nv\' driver instead.')
-            prevDriver = "nv"
-            self.config.setOldDriver("nv")
+            print _('Using the \'nouveau\' driver instead.')
+            prevDriver = "nouveau"
+            self.config.setOldDriver("nouveau")
         self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
         self.removeOption(self.majorVendor,"DisableGLXRootClipping")
         self.toggleDriver(self.majorVendor, prevDriver)


Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-nvidia-96xx.spec	27 Mar 2010 11:00:42 -0000	1.18
+++ xorg-x11-drv-nvidia-96xx.spec	14 Aug 2010 18:58:30 -0000	1.19
@@ -7,7 +7,7 @@
 %endif
 
 Name:            xorg-x11-drv-nvidia-96xx
-Version:         96.43.16
+Version:         96.43.18
 Release:         1%{?dist}
 Summary:         NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
 
@@ -206,7 +206,7 @@
 echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
 
 # Remove execstack needs on F-12 and laters
-%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+%if 0
 find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
 execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
 execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -222,15 +222,23 @@
 
 
 %post
-# Removes old legacy layout, fixed SELinux copy errors
-if [ ! $(ls /etc/udev/devices/nvidia* 2>/dev/null | wc -l) -eq 0 ];then rm -f /etc/udev/devices/nvidia*;fi ||:
 if [ "$1" -eq "1" ]; then
   # Enable nvidia driver when installing
   %{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
   # Add init script and start it
   /sbin/chkconfig --add nvidia-96xx ||:
   /etc/init.d/nvidia-96xx 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
+  fi
 fi
+if [ -x /usr/sbin/setsebool ] ; 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 ||:
 
 %post libs -p /sbin/ldconfig
 
@@ -280,6 +288,12 @@
 
 
 %changelog
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart at gmail.com> - 96.43.18-1
+- Update to 96.43.18
+- Fallback to nouveau instead of nv
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+
 * Sat Mar 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 96.43.16-1
 - Update to 96.43.16