[VirtualGL/f17] import (#834127).
Gary Gatling
gsgatlin at fedoraproject.org
Thu Jan 17 22:33:45 UTC 2013
commit 7490ce7225b2212fd6accde22f59e34c46d308e4
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date: Thu Jan 17 17:30:38 2013 -0500
import (#834127).
.gitignore | 1 +
VirtualGL-redhatpathsfix.patch | 43 --------------------------------
VirtualGL-redhatpathsmultilibfix.patch | 12 +++++++++
VirtualGL.spec | 17 +++++++++---
sources | 2 +-
5 files changed, 27 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b73d9a8..0677595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/VirtualGL-2.3.1.tar.gz
+/VirtualGL-2.3.2.tar.gz
diff --git a/VirtualGL-redhatpathsmultilibfix.patch b/VirtualGL-redhatpathsmultilibfix.patch
new file mode 100644
index 0000000..4d49ed8
--- /dev/null
+++ b/VirtualGL-redhatpathsmultilibfix.patch
@@ -0,0 +1,12 @@
+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+"$@"}
+
+ *)
+
++LD_LIBRARY_PATH=/usr/lib64/VirtualGL:/usr/lib/VirtualGL:$LD_LIBRARY_PATH
++
+ if [ -z "$LD_PRELOAD" ]; then
+ LD_PRELOAD=librrfaker.so
+ else
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 2654b3a..2b8a23b 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -1,16 +1,16 @@
Summary: A toolkit for displaying OpenGL applications to thin clients
Name: VirtualGL
-Version: 2.3.1
+Version: 2.3.2
URL: http://www.virtualgl.org/
Group: Applications/System
Source0: http://downloads.sourceforge.net/project/virtualgl/VirtualGL/%{version}/VirtualGL-%{version}.tar.gz
# Fix vglrun to be able to load the lib*faker libs
-Patch0: %{name}-redhatpathsfix.patch
+Patch0: %{name}-redhatpathsmultilibfix.patch
# Use system fltk
Patch1: %{name}-fltk.patch
# Use system glx.h
Patch2: %{name}-glx.patch
-Release: 8%{?dist}
+Release: 2%{?dist}
License: wxWidgets
%if 0%{?rhel} == 6
BuildRequires: cmake28
@@ -66,7 +66,7 @@ Development headers and libraries for VirtualGL.
%prep
%setup -q
-%patch0 -p1 -b .redhatpathsfix
+%patch0 -p1 -b .redhatpathsmultilibfix
%patch1 -p1 -b .fltk
%patch2 -p1 -b .glx
sed -i -e 's,"glx.h",<GL/glx.h>,' server/*.[hc]*
@@ -121,6 +121,15 @@ mv $RPM_BUILD_ROOT%{_libdir}/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/l
%changelog
+* Thu Jan 17 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-1
+- rebuilding.
+
+* Sun Jan 13 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-2
+- update to 2.3.2.
+
+* Tue Oct 23 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-9
+- Fix problems with multilib support. Fix created by Andy Kwong.
+
* Sun Jul 22 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-8
- removed BuildRequires: mxml-devel. see BZ839060. (#839060)
diff --git a/sources b/sources
index 0abb4c1..3eec22a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c7dcfce0541df7f5bd8a07d4c480fb1 VirtualGL-2.3.1.tar.gz
+29aaf0607a1031fa326444ff0321bcec VirtualGL-2.3.2.tar.gz
More information about the scm-commits
mailing list