From: Karol Krenski <charles@pld-linux.org>
Date: Mon, 6 Aug 2012 22:29:19 +0000 (+0200)
Subject: - 4.2.0 BETA1
X-Git-Tag: auto/th/VirtualBox-4.2.0-2~3^2~5
X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=05c5271fb412121fe36276269db2ea7db98dd85a

- 4.2.0 BETA1
---

diff --git a/VirtualBox-vnc.patch b/VirtualBox-vnc.patch
deleted file mode 100644
index 2edcd47..0000000
--- a/VirtualBox-vnc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- # Enable S3 support (requires libcurl)
- VBOX_WITH_S3 = 1
- ## @}
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2943fce..1491bf5 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,19 +32,19 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		2
+%define		rel		0.1
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{_alt_kernel}
-Version:	4.1.18
+Version:	4.2.0
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
-Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5:	38db0a87cba659b484af868b0c2bd3ac
-Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	f8da062c7a116796304a8e8faf3fc32f
+Source0:	http://download.virtualbox.org/virtualbox/%{version}_BETA1/%{pname}-%{version}_BETA1.tar.bz2
+# Source0-md5:	6f2f004f632efb7e6c5cbb7840b89599
+Source1:	http://download.virtualbox.org/virtualbox/%{version}_BETA1/VBoxGuestAdditions_%{version}_BETA1.iso
+# Source1-md5:	23da6e1de57eac8136ea9c50384e2e34
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
@@ -64,7 +64,7 @@ Patch0:		%{pname}-configure-spaces.patch
 Patch1:		%{pname}-export_modules.patch
 Patch2:		%{pname}-VBoxSysInfo.patch
 Patch3:		%{pname}-warning_workaround.patch
-Patch4:		%{pname}-vnc.patch
+
 Patch5:		%{pname}-dri.patch
 Patch6:		%{pname}-disable_build_NetBiosBin.patch
 Patch7:		xserver-1.12.patch
@@ -486,7 +486,7 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -504,7 +504,7 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers
 ../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening
 tar -zxf host-modules.tar.gz -C HostDrivers
 cd -
-%patch10 -p1
+#%patch10 -p1 // needs updating
 %patch11 -p1
 
 
@@ -599,9 +599,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{src,sdk,testcase}
 rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2
 rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
-
-# IPRT Testcase / Tool - Source Code Massager.
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/scm
+rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
 
 # Guest Only Tools
 install -d $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,xdg/autostart}
@@ -793,6 +791,8 @@ fi
 %defattr(644,root,root,755)
 %dir %{_libdir}/VirtualBox
 %dir %{_libdir}/VirtualBox/ExtensionPacks
+%dir %{_libdir}/VirtualBox/ExtensionPacks/VNC
+%dir %{_libdir}/VirtualBox/ExtensionPacks/VNC/linux*
 %dir %{_libdir}/VirtualBox/additions
 %dir %{_libdir}/VirtualBox/components
 %dir %{_libdir}/VirtualBox/nls
@@ -808,6 +808,7 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/DBGCPlugInDiggers.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxAuth.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxAuthSimple.so
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxAutostart
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBalloonCtrl
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxCreateUSBNode.sh
@@ -815,6 +816,7 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD2.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDD.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxDDU.so
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxDragAndDropSvc.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxExtPackHelperApp
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestControlSvc.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxGuestPropSvc.so
@@ -842,11 +844,13 @@ fi
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxTestOGL
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxTunctl
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxVMM.so
+%attr(755,root,root) %{_libdir}/VirtualBox/VBoxVMMPreload
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMC.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOMIPCD
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxXPCOM.so
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox
 %attr(755,root,root) %{_libdir}/VirtualBox/VirtualBox-wrapper.sh
+%attr(755,root,root) %{_libdir}/VirtualBox/ExtensionPacks/VNC/linux*/VBoxVNC*.so
 %{_libdir}/VirtualBox/VBoxDD2GC.gc
 %{_libdir}/VirtualBox/VBoxDDGC.gc
 %{_libdir}/VirtualBox/VMMGC.gc
@@ -857,6 +861,7 @@ fi
 %{_libdir}/VirtualBox/VBoxEFI32.fd
 %{_libdir}/VirtualBox/VBoxEFI64.fd
 %{_libdir}/VirtualBox/components/VBoxXPCOMBase.xpt
+%{_libdir}/VirtualBox/ExtensionPacks/VNC/ExtPack.xml
 %{_libdir}/VirtualBox/components/VirtualBox_XPCOM.xpt
 %attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxC.so
 %attr(755,root,root) %{_libdir}/VirtualBox/components/VBoxSVCM.so