gsgatlin pushed to VirtualGL (el6). "add patch for (#923961)"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 28 22:38:24 UTC 2015


>From 8f652dedc1600ae47ca783f7d26c3ca525e92a8c Mon Sep 17 00:00:00 2001
From: Gary Gatling <gsgatlin at ncsu.edu>
Date: Mon, 25 Mar 2013 15:22:50 -0400
Subject: add patch for (#923961)


diff --git a/VirtualGL-redhatpathsfix.patch b/VirtualGL-redhatpathsfix.patch
new file mode 100644
index 0000000..d9ee810
--- /dev/null
+++ b/VirtualGL-redhatpathsfix.patch
@@ -0,0 +1,12 @@
+diff -up VirtualGL-2.3.2/client/vglconnect.redhatpathsfix VirtualGL-2.3.2/client/vglconnect
+--- VirtualGL-2.3.2/client/vglconnect.redhatpathsfix	2013-03-20 16:01:50.656178363 -0400
++++ VirtualGL-2.3.2/client/vglconnect	2013-03-20 16:03:02.453525945 -0400
+@@ -52,7 +52,7 @@ usage()
+ }
+ 
+ if [ -z $VGL_BINDIR ]; then
+-	VGL_BINDIR=/opt/VirtualGL/bin
++	VGL_BINDIR=/usr/bin
+ fi
+ 
+ while [ $# -gt 0 ]
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 1303500..532f6b6 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -10,7 +10,9 @@ Patch0:         %{name}-redhatpathsmultilibfix.patch
 Patch1:         %{name}-fltk.patch
 # Use system glx.h
 Patch2:         %{name}-glx.patch
-Release:        3%{?dist}
+# fix for bz923961
+Patch3:         %{name}-redhatpathsfix.patch
+Release:        4%{?dist}
 License:        wxWidgets
 %if 0%{?rhel} == 6
 BuildRequires: cmake28
@@ -23,6 +25,7 @@ BuildRequires:  turbojpeg-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  libXv-devel
 Requires:       fltk
+Provides:       bumblebee-bridge
 
 %description
 VirtualGL is a toolkit that allows most Unix/Linux OpenGL applications to be
@@ -69,6 +72,8 @@ Development headers and libraries for VirtualGL.
 %patch0 -p1 -b .redhatpathsmultilibfix
 %patch1 -p1 -b .fltk
 %patch2 -p1 -b .glx
+%patch3 -p1 -b .redhatpathsfix
+
 sed -i -e 's,"glx.h",<GL/glx.h>,' server/*.[hc]*
 # Remove bundled libraries
 rm -r client/{putty,x11windows} common/glx* include/FL server/fltk
@@ -121,6 +126,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/l
 
 
 %changelog
+* 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.
+
 * Wed Feb 20 2013 Adam Tkac <atkac redhat com> - 2.3.2-3
 - rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/VirtualGL.git/commit/?h=el6&id=8f652dedc1600ae47ca783f7d26c3ca525e92a8c


More information about the scm-commits mailing list