[VirtualGL/f17: 4/4] Merge branch 'master' into f17

[Gary Gatling]

commit e6afe536d36fb0c3ee0fadff52f6cec8b1b912d8
Merge: 7490ce7 8f652de
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date:   Mon Mar 25 16:16:59 2013 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	VirtualGL-redhatpathsfix.patch
    	VirtualGL.spec

 VirtualGL-redhatpathsfix.patch |   12 ++++++++++++
 VirtualGL.spec                 |   19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --cc VirtualGL.spec
index 2b8a23b,532f6b6..8689164
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@@ -10,7 -10,9 +10,13 @@@ Patch0:         %{name}-redhatpathsmult
  Patch1:         %{name}-fltk.patch
  # Use system glx.h
  Patch2:         %{name}-glx.patch
++<<<<<<< HEAD
 +Release:        2%{?dist}
++=======
+ # fix for bz923961
+ Patch3:         %{name}-redhatpathsfix.patch
+ Release:        4%{?dist}
++>>>>>>> master
  License:        wxWidgets
  %if 0%{?rhel} == 6
  BuildRequires: cmake28
@@@ -121,6 -126,13 +130,16 @@@ mv $RPM_BUILD_ROOT%{_libdir}/librrfaker
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * 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
+ 
++>>>>>>> master
  * Thu Jan 17 2013 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.2-1
  - rebuilding.