Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3254
Modified Files:
VirtualBox-OSE-3.1.0-strings.patch VirtualBox-OSE.spec
Log Message:
Actually replace the tarball
VirtualBox-OSE-3.1.0-strings.patch:
Index: VirtualBox-OSE-3.1.0-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-3.1.0-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.1.0-strings.patch 12 Nov 2009 16:24:20 -0000 1.1
+++ VirtualBox-OSE-3.1.0-strings.patch 22 Nov 2009 00:14:15 -0000 1.2
@@ -3,14 +3,14 @@
Lubomir Rintel <lkundrak(a)v3.sk>
diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings
VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-11-05
17:53:04.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-11-12
15:34:13.000000000 +0100
+--- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-11-20
07:46:44.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-11-22
01:13:05.266805602 +0100
@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel "
+- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel
"
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv
setup'</font><br/><br/>"
- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
@@ -33,14 +33,14 @@
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
-- "It may help to reinstall VirtualBox."
+- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings
VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings 2009-11-05
17:54:06.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-11-12 15:34:13.000000000
+0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-11-22 01:10:57.110802086
+0100
@@ -36,19 +36,20 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
@@ -69,7 +69,7 @@
EOF
diff -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings
VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings 2009-09-01
13:22:55.000000000 +0200
-+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-11-12
15:34:13.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-11-22
01:10:57.114801682 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
@@ -80,8 +80,8 @@
Type=Application
Exec=VirtualBox
diff -up VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings
VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp
---- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings 2009-11-10 16:47:29.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp 2009-11-12 15:34:13.000000000 +0100
+--- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings 2009-11-20 07:46:35.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp 2009-11-22 01:10:57.127800658 +0100
@@ -336,8 +336,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv
kernel module "
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- VirtualBox-OSE.spec 21 Nov 2009 18:02:48 -0000 1.37
+++ VirtualBox-OSE.spec 22 Nov 2009 00:14:15 -0000 1.38
@@ -23,7 +23,7 @@
Group: Development/Tools
License: GPLv2 or (GPLv2 and CDDL)
URL:
http://www.virtualbox.org/wiki/VirtualBox
-Source0:
http://download.virtualbox.org/virtualbox/%{version}_BETA1/VirtualBox-%{v...
+Source0:
http://download.virtualbox.org/virtualbox/%{version}_BETA2/VirtualBox-%{v...
Source1:
http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
Source3: VirtualBox-OSE-90-vboxdrv.rules
Source4: VirtualBox-OSE-90-vboxdrv.rules.hardening