rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.153,1.154

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30285

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
Avoid prelink to mess with nvidia libs - rfbz#3258



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.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- xorg-x11-drv-nvidia.spec	16 Aug 2014 15:41:21 -0000	1.153
+++ xorg-x11-drv-nvidia.spec	16 Aug 2014 16:08:18 -0000	1.154
@@ -269,6 +269,10 @@
 install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
 %endif
 
+#Avoid prelink to mess with nvidia libs - rfbz#3258
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf
+
 #Install the initscript
 tar jxf nvidia-persistenced-init.tar.bz2
 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -297,6 +301,11 @@
   fi
 fi
 
+%pre libs
+if [ -d %{_sysconfdir}/prelink.conf.d ]; then
+echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf
+fi
+
 %post
 if [ "$1" -eq "1" ]; then
   ISGRUB1=""
@@ -417,6 +426,7 @@
 %defattr(-,root,root,-)
 %dir %{_nvidia_libdir}
 %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
 %{_nvidia_libdir}/alternate-install-present
 %{_nvidia_libdir}/*.so.*
 %exclude %{_nvidia_libdir}/libcuda.so*