packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-vnc.patch (NEW)...

[baggins]

Author: baggins                      Date: Tue Aug 31 15:41:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- enable VNC server in VBoxHeadless frontend

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.304 -> 1.305) , VirtualBox-vnc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.304 packages/VirtualBox/VirtualBox.spec:1.305
--- packages/VirtualBox/VirtualBox.spec:1.304	Mon Aug 30 10:25:54 2010
+++ packages/VirtualBox/VirtualBox.spec	Tue Aug 31 17:41:06 2010
@@ -28,7 +28,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		8
+%define		rel		8.1
 %define		pname		VirtualBox
 
 Summary:	VirtualBox OSE - x86 hardware virtualizer
@@ -57,6 +57,7 @@
 Patch2:		%{pname}-export_modules.patch
 Patch3:		%{pname}-VBoxSysInfo.patch
 Patch4:		%{pname}-warning_workaround.patch
+Patch5:		%{pname}-vnc.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.535
 %if %{with userspace}
@@ -91,6 +92,7 @@
 BuildRequires:	libstdc++-devel >= 5:3.2.3
 BuildRequires:	libstdc++-static >= 5:3.2.3
 BuildRequires:	libuuid-devel
+BuildRequires:	libvncserver-devel
 BuildRequires:	libxml2-devel >= 2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 BuildRequires:	libxslt-progs >= 1.1.17
@@ -407,7 +409,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
+%{__sed} -i -e 's,#VBOX_WITH_VNC,VBOX_WITH_VNC,'
 %{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},' src/VBox/Installer/linux/virtualbox.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/linux/virtualbox.desktop
 
@@ -826,6 +830,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.305  2010/08/31 15:41:06  baggins
+- enable VNC server in VBoxHeadless frontend
+
 Revision 1.304  2010/08/30 08:25:54  hawk
 - testcases are broken on some gcc versions, disable them till they'll get
   fixed (as suggested by upstream in comments to bug reports)

================================================================
Index: packages/VirtualBox/VirtualBox-vnc.patch
diff -u /dev/null packages/VirtualBox/VirtualBox-vnc.patch:1.1
--- /dev/null	Tue Aug 31 17:41:11 2010
+++ packages/VirtualBox/VirtualBox-vnc.patch	Tue Aug 31 17:41:06 2010
@@ -0,0 +1,11 @@
+--- VirtualBox-3.2.8_OSE/Config.kmk~	2010-08-05 13:42:00.000000000 +0200
++++ VirtualBox-3.2.8_OSE/Config.kmk	2010-08-31 17:39:38.029460770 +0200
+@@ -500,7 +500,7 @@
+  VBOX_WITH_CROGL = 1
+ endif
+ # Enable the VNC server in VBoxHeadless (GPL only).
+-#VBOX_WITH_VNC = 1
++VBOX_WITH_VNC = 1
+ ## @}
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.304&r2=1.305&f=u