rpms/xorg-x11-drv-nvidia-173xx/F-12 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 xorg-x11-drv-nvidia-173xx.spec, 1.16, 1.17 nvidia-173xx-config-display, 1.3, 1.4

[Nicolas Chauvet]

Author: kwizart

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

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



Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Mar 2010 10:47:08 -0000	1.7
+++ sources	14 Aug 2010 15:43:18 -0000	1.8
@@ -1,2 +1,2 @@
-a61b6c1627984f93af73eb446a8beb5e  NVIDIA-Linux-x86_64-173.14.25-pkg0.run
-397bac51f760505ea57e863c1db9c572  NVIDIA-Linux-x86-173.14.25-pkg0.run
+269425dbc2d9d4ecdc54692281d6d738  NVIDIA-Linux-x86_64-173.14.27-pkg0.run
+35a6531f71cd6b070f10be8ed11093d4  NVIDIA-Linux-x86-173.14.27-pkg0.run


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Mar 2010 10:47:08 -0000	1.7
+++ .cvsignore	14 Aug 2010 15:43:18 -0000	1.8
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-173.14.25-pkg0.run
-NVIDIA-Linux-x86-173.14.25-pkg0.run
+NVIDIA-Linux-x86_64-173.14.27-pkg0.run
+NVIDIA-Linux-x86-173.14.27-pkg0.run


Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nvidia-173xx.spec	27 Mar 2010 10:47:08 -0000	1.16
+++ xorg-x11-drv-nvidia-173xx.spec	14 Aug 2010 15:43:18 -0000	1.17
@@ -7,7 +7,7 @@
 %endif
 
 Name:          xorg-x11-drv-nvidia-173xx
-Version:       173.14.25
+Version:       173.14.27
 Release:       1%{?dist}
 Summary:       NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
 
@@ -218,7 +218,7 @@
 find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
 
 # 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
@@ -235,15 +235,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-173xx-config-display enable &>/dev/null ||:
   # Add init script and start it
   /sbin/chkconfig --add nvidia-173xx ||:
   /etc/init.d/nvidia-173xx 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
 
@@ -296,6 +304,12 @@
 
 
 %changelog
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart at gmail.com> - 173.14.27-1
+- Update to 173.14.27
+- 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> - 173.14.25-1
 - Update to 173.14.25
 


Index: nvidia-173xx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12/nvidia-173xx-config-display,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-173xx-config-display	14 Nov 2009 21:32:24 -0000	1.3
+++ nvidia-173xx-config-display	14 Aug 2010 15:43:18 -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)