From 092da7f339df6ae6451f7a501fd26a6982f53b55 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Fri, 21 Jan 2011 19:23:00 +0000
Subject: [PATCH] Update to 260.19.36

---
 .gitignore               |  4 ++--
 sources                  |  4 ++--
 xorg-x11-drv-nvidia.spec | 19 +++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index d9b0be3..ee468e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-260.19.29.run
-NVIDIA-Linux-x86-260.19.29.run
+NVIDIA-Linux-x86-260.19.36.run
+NVIDIA-Linux-x86_64-260.19.36.run
diff --git a/sources b/sources
index 4780437..35b43a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0539f7af29e19971745811e971b074f8  NVIDIA-Linux-x86_64-260.19.29.run
-e982a05a85c68130acfe1d48086250e3  NVIDIA-Linux-x86-260.19.29.run
+2826484d87827351774449382e45c4a9  NVIDIA-Linux-x86-260.19.36.run
+88376a73c8ba487526a6f62ac82c7c75  NVIDIA-Linux-x86_64-260.19.36.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f5199c1..808a888 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -8,8 +8,8 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
-Version:         260.19.29
-Release:         2%{?dist}
+Version:         260.19.36
+Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -233,8 +233,7 @@ install -pm 0644 nvidia-settings.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
 rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so
 
 # Remove execstack needs on F-12 and laters
-#if 0%{?fedora} >= 12 || 0%{?rhel} > 5
-%if 0
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
 find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
 %ifarch x86_64
 execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
@@ -264,12 +263,6 @@ if [ "$1" -eq "1" ]; then
     /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
 
@@ -348,6 +341,12 @@ fi ||:
 
 
 %changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart@gmail.com> - 1:260.19.36-1
+- Update to 260.19.36
+- Restore execstack -c on redistributed binaries
+  instead of forcing selinux bool.
+  (nvidia-installer clears it at runtime when appropriate).
+
 * Fri Dec 17 2010 Nicolas Chauvet <kwizart@gmail.com> - 1:260.19.29-2
 - Fix uninstall on kvarriant - rfbz#1559