rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.30,1.31
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26392
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
- Remove execstack on nvidia binaries and libraries.
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-nvidia.spec 3 Nov 2009 22:14:18 -0000 1.30
+++ xorg-x11-drv-nvidia.spec 14 Nov 2009 17:07:03 -0000 1.31
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 190.42
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -43,6 +43,7 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
+BuildRequires: prelink
Requires: which
Requires: livna-config-display >= 0.0.21
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
@@ -240,6 +241,15 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
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
+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
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-{settings,smi}
+execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+%endif
+
%clean
@@ -314,6 +324,9 @@
%changelog
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-3
+- Remove execstack on nvidia binaries and libraries.
+
* Tue Nov 3 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-2
- Update blacklist-nouveau.conf - rfbz#914