From f727d6ed86b86664ac092adc64d3e40038ad560b Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Tue, 19 Jun 2012 04:25:17 +0000
Subject: [PATCH] update build/packaging files so we require/recommend the bits
 needed for opengl support: PyOpenGL and pygtkglext for Fedora/CentOS>=6,
 python-gtkglext1 and python-opengl for debian (recommends),
 dev-python/pyopengl and dev-python/pygtkglext for gentoo (via opengl USE
 flag)

git-svn-id: https://xpra.org/svn/Xpra/trunk@937 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 debian/control            | 2 +-
 scripts/xpra-0.4.0.ebuild | 3 ++-
 src/xpra.spec             | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 337dbe1486..a0063d7041 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: tabbing/tiling window manager using GTK+
 Package: xpra
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-wimpiggy (=${binary:Version}), python-gtk2, xvfb, x11-xserver-utils
-Recommends: python-imaging
+Recommends: python-imaging, python-gtkglext1, python-opengl
 Suggests: openssh-client, openssh-server, python-dbus
 Description: tool to detach/reattach running X programs
  Xpra gives you the functionality of GNU Screen for X applications.
diff --git a/scripts/xpra-0.4.0.ebuild b/scripts/xpra-0.4.0.ebuild
index ca48f192e5..3032869d96 100644
--- a/scripts/xpra-0.4.0.ebuild
+++ b/scripts/xpra-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="jpeg libnotify parti png server x264 vpx ssh"
+IUSE="jpeg libnotify parti png server x264 vpx ssh opengl"
 
 EPATCH_OPTS="-p1"
 
@@ -34,6 +34,7 @@ RDEPEND="${COMMON_DEPEND}
 	parti? ( dev-python/ipython
 		 dev-python/dbus-python )
 	libnotify? ( dev-python/dbus-python )
+	opengl? ( dev-python/pyopengl dev-python/pygtkglext )
 	jpeg? ( dev-python/imaging )
 	png? ( dev-python/imaging )
 	x264? ( media-libs/x264 >=dev-python/cython-0.16 )
diff --git a/src/xpra.spec b/src/xpra.spec
index 09d318ba9b..da7b212a89 100644
--- a/src/xpra.spec
+++ b/src/xpra.spec
@@ -14,11 +14,14 @@
 %define requires pygtk2, xorg-x11-server-utils, xorg-x11-server-Xvfb, python-imaging, dbus-python
 %define requires_extra , libvpx, libx264
 %if %{defined fedora}
-%define requires_extra , libvpx, libx264_118
+%define requires_extra , libvpx, libx264_118, PyOpenGL, pygtkglext
 %endif
 %if 0%{?static_video_libs}
 %define requires_extra %{nil}
 %endif
+%if 0%{?el6}
+%define requires_extra , PyOpenGL, pygtkglext
+%endif
 %if 0%{?el5}
 %define requires_extra , python-uuid, python-ctypes
 %define include_egg 0
@@ -30,7 +33,7 @@
 
 
 Summary: Xpra gives you "persistent remote applications" for X.
-Vendor: http://code.google.com/p/partiwm/wiki/xpra
+Vendor: http://xpra.org/
 Name: xpra
 Version: %{version}
 Release: %{build_no}