[VirtualGL] fix patch for (#923961)

[Gary Gatling]

commit 9eff781bfa04bffa36906dc9b5a6532647c872a7
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date:   Mon May 6 16:45:20 2013 -0400

    fix patch for (#923961)

 VirtualGL-redhatpathsmultilibfix.patch |   87 ++++++++++++++++++++++++++++++--
 VirtualGL.spec                         |    6 ++-
 2 files changed, 88 insertions(+), 5 deletions(-)
---
diff --git a/VirtualGL-redhatpathsmultilibfix.patch b/VirtualGL-redhatpathsmultilibfix.patch
index 4d49ed8..62a3040 100644
--- a/VirtualGL-redhatpathsmultilibfix.patch
+++ b/VirtualGL-redhatpathsmultilibfix.patch
@@ -1,12 +1,91 @@
 diff -up VirtualGL-2.3.2/server/vglrun.redhatpathsmultilibfix VirtualGL-2.3.2/server/vglrun
---- VirtualGL-2.3.2/server/vglrun.redhatpathsmultilibfix	2013-01-13 11:52:09.971951341 -0500
-+++ VirtualGL-2.3.2/server/vglrun	2013-01-13 11:54:05.809955713 -0500
-@@ -288,6 +288,8 @@ exec ${1+"$@"}
+--- VirtualGL-2.3.2/server/vglrun.redhatpathsmultilibfix	2013-04-20 05:54:45.520000000 -0400
++++ VirtualGL-2.3.2/server/vglrun	2013-04-20 05:55:26.107000022 -0400
+@@ -220,17 +220,17 @@ SunOS)
+ 
+ if [ -z "$FAKERLIB" ]; then
+ FAKERLIB=librrfaker.so
+-if [ -f /opt/VirtualGL/lib/64/librrfaker.so ]
++if [ -f /usr/lib64/VirtualGL/librrfaker.so ]
+ then
+-	FAKERLIB=/opt/VirtualGL/lib/64/librrfaker.so
++	FAKERLIB=/usr/lib64/VirtualGL/librrfaker.so
+ fi
+ fi
+ export FAKERLIB
+ if [ -z "$FAKERLIB32" ]; then
+ FAKERLIB32=librrfaker.so
+-if [ -f /opt/VirtualGL/lib/librrfaker.so ]
++if [ -f /usr/lib/VirtualGL/librrfaker.so ]
+ then
+-	FAKERLIB32=/opt/VirtualGL/lib/librrfaker.so
++	FAKERLIB32=/usr/lib/VirtualGL/librrfaker.so
+ fi
+ fi
+ export FAKERLIB32
+@@ -241,17 +241,17 @@ if [ $__VGL_64 -eq 0 ]; then
+ 		LD_PRELOAD_32=$FAKERLIB32:$LD_PRELOAD_32
+ 	fi
+ 	if [ $__VGL_DL -eq 1 ]; then
+-		if [ -f /opt/VirtualGL/lib/libdlfaker.so ]
++		if [ -f /usr/lib/VirtualGL/libdlfaker.so ]
+ 		then
+-			LD_PRELOAD_32=/opt/VirtualGL/lib/libdlfaker.so:$LD_PRELOAD_32
++			LD_PRELOAD_32=/usr/lib/VirtualGL/libdlfaker.so:$LD_PRELOAD_32
+ 		else
+ 			LD_PRELOAD_32=libdlfaker.so:$LD_PRELOAD_32
+ 		fi
+ 	fi
+ 	if [ $__VGL_GE -eq 1 ]; then
+-		if [ -f /opt/VirtualGL/lib/libgefaker.so ]
++		if [ -f /usr/lib/VirtualGL/libgefaker.so ]
+ 		then
+-			LD_PRELOAD_32=/opt/VirtualGL/lib/libgefaker.so:$LD_PRELOAD_32
++			LD_PRELOAD_32=/usr/lib/VirtualGL/libgefaker.so:$LD_PRELOAD_32
+ 		else
+ 			LD_PRELOAD_32=libgefaker.so:$LD_PRELOAD_32
+ 		fi
+@@ -265,17 +265,17 @@ if [ $__VGL_32 -eq 0 ]; then
+ 		LD_PRELOAD_64=$FAKERLIB:$LD_PRELOAD_64
+ 	fi
+ 	if [ $__VGL_DL -eq 1 ]; then
+-		if [ -f /opt/VirtualGL/lib/64/libdlfaker.so ]
++		if [ -f /usr/lib64/VirtualGL/libdlfaker.so ]
+ 		then
+-			LD_PRELOAD_64=/opt/VirtualGL/lib/64/libdlfaker.so:$LD_PRELOAD_64
++			LD_PRELOAD_64=/usr/lib64/VirtualGL/libdlfaker.so:$LD_PRELOAD_64
+ 		else
+ 			LD_PRELOAD_64=libdlfaker.so:$LD_PRELOAD_64
+ 		fi
+ 	fi
+ 	if [ $__VGL_GE -eq 1 ]; then
+-		if [ -f /opt/VirtualGL/lib/64/libgefaker.so ]
++		if [ -f /usr/lib64/VirtualGL/libgefaker.so ]
+ 		then
+-			LD_PRELOAD_64=/opt/VirtualGL/lib/64/libgefaker.so:$LD_PRELOAD_64
++			LD_PRELOAD_64=/usr/lib64/VirtualGL/libgefaker.so:$LD_PRELOAD_64
+ 		else
+ 			LD_PRELOAD_64=libgefaker.so:$LD_PRELOAD_64
+ 		fi
+@@ -288,16 +288,18 @@ exec ${1+"$@"}
  
  *)
  
 +LD_LIBRARY_PATH=/usr/lib64/VirtualGL:/usr/lib/VirtualGL:$LD_LIBRARY_PATH
 +
  if [ -z "$LD_PRELOAD" ]; then
- 	LD_PRELOAD=librrfaker.so
+-	LD_PRELOAD=librrfaker.so
++	LD_PRELOAD=/usr/\$LIB/VirtualGL/librrfaker.so
  else
+ 	LD_PRELOAD=librrfaker.so:$LD_PRELOAD
+ fi
+ if [ $__VGL_DL -eq 1 ]; then
+-	LD_PRELOAD=libdlfaker.so:$LD_PRELOAD
++	LD_PRELOAD=/usr/\$LIB/VirtualGL/libdlfaker.so:$LD_PRELOAD
+ fi
+ if [ $__VGL_GE -eq 1 ]; then
+-	LD_PRELOAD=libgefaker.so:$LD_PRELOAD
++	LD_PRELOAD=/usr/\$LIB/VirtualGL/libgefaker.so:$LD_PRELOAD
+ fi
+ export LD_PRELOAD
+ exec ${1+"$@"}
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 532f6b6..5394bb8 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -12,7 +12,7 @@ Patch1:         %{name}-fltk.patch
 Patch2:         %{name}-glx.patch
 # fix for bz923961
 Patch3:         %{name}-redhatpathsfix.patch
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        wxWidgets
 %if 0%{?rhel} == 6
 BuildRequires: cmake28
@@ -99,6 +99,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/glxinfo
 mv $RPM_BUILD_ROOT%{_libdir}/libdlfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/libdlfaker.so
 mv $RPM_BUILD_ROOT%{_libdir}/libgefaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/libgefaker.so
 mv $RPM_BUILD_ROOT%{_libdir}/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/librrfaker.so
+ln -sf %{_libdir}/VirtualGL/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/fakelib/libGL.so
 
 %post -p /sbin/ldconfig
 
@@ -126,6 +127,9 @@ mv $RPM_BUILD_ROOT%{_libdir}/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/l
 
 
 %changelog
+* Mon May 6 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-5
+- Fix (#923961) More path changes to vglrun to really fix issue.
+
 * Sun Mar 24 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-4
 - Fix (#923961) Change /opt/VirtualGL/bin to /usr/bin in vglconnect.
 - Add virtual provides for bumblebee-bridge package.