- updated to RC1

diff --git a/16-no-update.patch b/16-no-update.patch
index be4e300de91ac978281bf23e02b0c9a9c8fcd9ce..90021d463ad53dc41e56e40a09d5e659f99fd25b 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -2,32 +2,31 @@ Description: Disable "Check for Updates" action.
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
 Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <debfx-pkg@fobos.de>
 
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp     2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp  2011-01-02 00:03:55.120533579 +0100
-@@ -501,6 +501,10 @@
+--- VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig  2012-08-13 13:35:11.000000000 +0200
++++ VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp       2012-08-16 02:12:54.423685632 +0200
+@@ -544,6 +544,11 @@
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
 +        case GLSettingsPage_Update:
 +        {
-+            return false;
-+        }
++             return false;
++             break;
++         }
          default:
              break;
      }
---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp.orig   2011-08-15 14:28:35.000000000 +0200
-+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp        2011-08-17 22:48:08.700558251 +0200
-@@ -1747,12 +1747,6 @@
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Register));
+--- VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig  2012-08-13 13:35:09.000000000 +0200
++++ VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp       2012-08-16 02:03:36.328578159 +0200
+@@ -1291,11 +1291,7 @@
+     m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
+     pMenu->addAction(m_pRegisterAction);
  #endif /* VBOX_WITH_REGISTRATION */
- 
--    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update));
--
+     m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
+-    pMenu->addAction(m_pUpdateAction);
 -#ifndef Q_WS_MAC
 -    pMenu->addSeparator();
 -#endif /* !Q_WS_MAC */
--
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
- 
-     /* Configure connections: */
+     m_pAboutAction = gActionPool->action(UIActionIndex_Simple_About);
+     pMenu->addAction(m_pAboutAction);
+ }

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 1491bf55cd2ccc8b76c9581c16d7adace186b2a7..73b4d2f49990157c0140f51153b388c224b14540 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,7 +32,7 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel             0.1
+%define                rel             0.2
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
@@ -41,10 +41,10 @@ Version:    4.2.0
 Release:       %{rel}
 License:       GPL v2
 Group:         Applications/Emulators
-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
+Source0:       http://download.virtualbox.org/virtualbox/%{version}_RC1/%{pname}-%{version}_RC1.tar.bz2
+# Source0-md5: 7054b78e43207f7050e30ca3bfa772e6
+Source1:       http://download.virtualbox.org/virtualbox/%{version}_RC1/VBoxGuestAdditions_%{version}_RC1.iso
+# Source1-md5: 4e467c9959ce5ea64202c5522b3364ef
 Source3:       %{pname}-vboxdrv.init
 Source4:       %{pname}-vboxguest.init
 Source5:       %{pname}-vboxnetflt.init
@@ -481,7 +481,7 @@ You should install this package in your Guest OS.
 Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n %{pname}-%{version}_RC1
 %patch0 -p1
 %patch1 -p1
 %patch2 -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 // needs updating
+%patch10 -p1
 %patch11 -p1
 
 
@@ -857,7 +857,7 @@ fi
 %{_libdir}/VirtualBox/VBoxDD2R0.r0
 %{_libdir}/VirtualBox/VBoxDDR0.r0
 %{_libdir}/VirtualBox/VMMR0.r0
-%{_libdir}/VirtualBox/EfiThunk
+#%{_libdir}/VirtualBox/EfiThunk
 %{_libdir}/VirtualBox/VBoxEFI32.fd
 %{_libdir}/VirtualBox/VBoxEFI64.fd
 %{_libdir}/VirtualBox/components/VBoxXPCOMBase.xpt