[VirtualGL] add patch for (#1088475)

Gary Gatling gsgatlin at fedoraproject.org
Mon Apr 28 20:15:13 UTC 2014


commit 7119bf47e4c07aca6da4966b9c3089dc245bc5d0
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date:   Mon Apr 28 16:15:00 2014 -0400

    add patch for (#1088475)

 VirtualGL-redhatlibexecpathsfix.patch |   19 +++++++++++++++++++
 VirtualGL.spec                        |   19 ++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/VirtualGL-redhatlibexecpathsfix.patch b/VirtualGL-redhatlibexecpathsfix.patch
new file mode 100644
index 0000000..ddf9f93
--- /dev/null
+++ b/VirtualGL-redhatlibexecpathsfix.patch
@@ -0,0 +1,19 @@
+diff -up VirtualGL-2.3.3/server/vglrun.redhatlibexecpathsfix VirtualGL-2.3.3/server/vglrun
+--- VirtualGL-2.3.3/server/vglrun.redhatlibexecpathsfix	2014-04-26 15:47:18.176869892 -0400
++++ VirtualGL-2.3.3/server/vglrun	2014-04-26 15:52:04.998734592 -0400
+@@ -210,11 +210,11 @@ fi
+ 
+ # This is so we can launch both 32-bit and 64-bit executables using the same
+ # script.
+-if [ -x "$MYPATH/.vglrun.vars64" ]; then
+-	. "$MYPATH/.vglrun.vars64"
++if [ -x "/usr/libexec/vglrun.vars64" ]; then
++	. "/usr/libexec/vglrun.vars64"
+ fi
+-if [ -x "$MYPATH/.vglrun.vars32" ]; then
+-	. "$MYPATH/.vglrun.vars32"
++if [ -x "/usr/libexec/vglrun.vars32" ]; then
++	. "/usr/libexec/vglrun.vars32"
+ fi
+ if [ ! -z "$VGL_LIBRARY_PATH" ]; then
+ 	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$VGL_LIBRARY_PATH
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 449450b..503a689 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -10,7 +10,9 @@ Patch0:         %{name}-fltk.patch
 Patch1:         %{name}-glx.patch
 # fix for bz923961
 Patch2:         %{name}-redhatpathsfix.patch
-Release:        2%{?dist}
+# fix for bz1088475
+Patch3:         %{name}-redhatlibexecpathsfix.patch
+Release:        3%{?dist}
 License:        wxWidgets
 %if 0%{?rhel} == 6
 BuildRequires: cmake28
@@ -70,6 +72,7 @@ Development headers and libraries for VirtualGL.
 %patch0 -p1 -b .fltk
 %patch1 -p1 -b .glx
 %patch2 -p1 -b .redhatpathsfix
+%patch3 -p1 -b .redhatlibexecpathsfix
 
 sed -i -e 's,"glx.h",<GL/glx.h>,' server/*.[hc]*
 # Remove bundled libraries
@@ -94,6 +97,13 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_bindir}/glxinfo
 ln -sf %{_libdir}/VirtualGL/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/fakelib/libGL.so
+# fix for bz1088475
+mkdir $RPM_BUILD_ROOT%{_libexecdir}
+%if %{__isa_bits} == 64
+mv $RPM_BUILD_ROOT%{_bindir}/.vglrun.vars64 $RPM_BUILD_ROOT%{_libexecdir}/vglrun.vars64
+%else
+mv $RPM_BUILD_ROOT%{_bindir}/.vglrun.vars32 $RPM_BUILD_ROOT%{_libexecdir}/vglrun.vars32
+%endif
 
 %post -p /sbin/ldconfig
 
@@ -114,10 +124,10 @@ ln -sf %{_libdir}/VirtualGL/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/fakelib/libG
 %{_bindir}/glreadtest
 %if %{__isa_bits} == 64
 %{_bindir}/glxspheres64
-%{_bindir}/.vglrun.vars64
+%{_libexecdir}/vglrun.vars64
 %else
 %{_bindir}/glxspheres
-%{_bindir}/.vglrun.vars32
+%{_libexecdir}/vglrun.vars32
 %endif
 %{_libdir}/VirtualGL/
 %{_libdir}/fakelib/
@@ -128,6 +138,9 @@ ln -sf %{_libdir}/VirtualGL/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/fakelib/libG
 
 
 %changelog
+* Sun Apr 27 2014 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.3-3
+- Fix (#1088475) don't install hidden files into /usr/bin
+
 * Thu Nov 7 2013 Dan HorĂ¡k <dan[at]danny.cz> - 2.3.3-2
 - fix build on non-x86 arches
 


More information about the scm-commits mailing list