Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26984/devel
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 260.19.36
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 14 Dec 2010 22:19:04 -0000 1.25
+++ .cvsignore 21 Jan 2011 19:23:00 -0000 1.26
@@ -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
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 14 Dec 2010 22:19:04 -0000 1.25
+++ sources 21 Jan 2011 19:23:00 -0000 1.26
@@ -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
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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-drv-nvidia.spec 17 Dec 2010 11:06:19 -0000 1.53
+++ xorg-x11-drv-nvidia.spec 21 Jan 2011 19:23:00 -0000 1.54
@@ -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 @@
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 @@
/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 @@
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)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(a)gmail.com> - 1:260.19.29-2
- Fix uninstall on kvarriant - rfbz#1559