[xorg-x11-drv-nvidia] Add libglvnd path to ld.so.conf.d conf file

Leigh Scott leigh123linux at rpmfusion.org
Wed Oct 12 11:46:13 CEST 2016


commit 62bcab11aa97cbca8bb64d2ad4798f1ec586d570
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 12 10:46:06 2016 +0100

    Add libglvnd path to ld.so.conf.d conf file

 xorg-x11-drv-nvidia.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index df34614..9934dc6 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,6 +1,7 @@
 %global        _nvidia_serie       nvidia
 %global        _nvidia_libdir      %{_libdir}/%{_nvidia_serie}
 %global        _nvidia_xorgdir     %{_nvidia_libdir}/xorg
+%global        _glvnd_libdir       %{_libdir}/libglvnd
 
 %global	       debug_package %{nil}
 %global	       __strip /bin/true
@@ -8,7 +9,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         370.28
-Release:         4%{?dist}
+Release:         5%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -167,7 +168,7 @@ rm -f nvidia-installer*
 install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
 
 install -m 0755 -d       $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
 
 #Blacklist nouveau (since F-11)
 install    -m 0755 -d         $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
@@ -547,6 +548,9 @@ fi ||:
 %{_nvidia_libdir}/libGLX_nvidia.so
 
 %changelog
+* Wed Oct 12 2016 Leigh Scott <leigh123linux at googlemail.com> - 1:370.28-5
+- Add libglvnd path to ld.so.conf.d conf file
+
 * Tue Oct 11 2016 Leigh Scott <leigh123linux at googlemail.com> - 1:370.28-4
 - Switch to system libglvnd
 - Fix unowned file links


More information about the rpmfusion-commits mailing list