6:27 p.m.
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8141
Modified Files:
VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-3.0.0-strings.patch
Removed Files:
VirtualBox-OSE-2.2.2-strings.patch
Log Message:
* Wed Jul 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-2
- Tidy up the filelist check
- Libs need to be executable for the dep generator (#698)
VirtualBox-OSE-3.0.0-strings.patch:
--- NEW FILE VirtualBox-OSE-3.0.0-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.
Lubomir Rintel <lkundrak(a)v3.sk>
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
VirtualBox-3.0.0_OSEb/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-06-24
16:38:16.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-07-03
14:14:27.528519750 +0300
@@ -72,13 +72,13 @@
);
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 "
- "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 "
- "package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root)
privileges:<br/><br/>"
+ " <font
color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -101,9 +101,9 @@
"Make sure the kernel module has been loaded successfully."
);
-/* 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 report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VBox.sh
VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-03-27 21:13:57.000000000
+0200
+++ VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VBox.sh 2009-07-03 14:12:02.490521356
+0300
@@ -36,19 +36,20 @@
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VirtualBox.desktop
VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VirtualBox.desktop
--- VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VirtualBox.desktop 2009-06-12
15:34:41.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VirtualBox.desktop 2009-07-03
14:12:02.492525812 +0300
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
-Name=Sun VirtualBox
+Name=VirtualBox OSE
GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
diff -urb VirtualBox-3.0.0_OSE/src/VBox/VMM/VM.cpp
VirtualBox-3.0.0_OSEb/src/VBox/VMM/VM.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/VM.cpp 2009-06-24 16:38:14.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/VMM/VM.cpp 2009-07-03 14:12:02.501771542 +0300
@@ -314,8 +314,8 @@
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv
kernel module "
"was either not loaded or /dev/vboxdrv is not set
up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as
root");
+ "Reboot the computer, or insert the kernel module
by executing "
+
"'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -356,8 +356,8 @@
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The
vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not
created for some "
- "reason. Re-setup the kernel module by executing
"
- "'/etc/init.d/vboxdrv setup' as
root");
+ "reason. Insert the kernel module by executing
"
+
"'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VirtualBox-OSE.spec 8 Jul 2009 13:35:40 -0000 1.8
+++ VirtualBox-OSE.spec 8 Jul 2009 18:27:29 -0000 1.9
@@ -9,8 +9,8 @@
%bcond_without hardening
Name: VirtualBox-OSE
-Version: 2.2.4
-Release: 4%{?dist}
+Version: 3.0.0
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -24,13 +24,16 @@
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2: VirtualBox-OSE-2.2.2-strings.patch
+Patch2: VirtualBox-OSE-3.0.0-strings.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kBuild >= 0.1.5-1
-BuildRequires: SDL-devel xalan-c-devel hal-devel
+BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: hal-devel
+BuildRequires: openssl-devel
+BuildRequires: libcurl-devel
BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
@@ -173,13 +176,14 @@
obj/bin/VBoxNetAdpCtl \
obj/bin/VirtualBox
-
# Other binaries
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxManage \
obj/bin/VBoxSVC \
obj/bin/VBoxXPCOMIPCD \
- obj/bin/VBoxSysInfo.sh
+ obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxshell.py \
+ obj/bin/VBoxTestOGL
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
@@ -208,7 +212,7 @@
# Guest tools
install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/additions/mountvboxsf \
- obj/bin/additions/vboxadd-timesync \
+ obj/bin/additions/VBoxService \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
@@ -323,9 +327,9 @@
%files guest
%defattr(-,root,root,-)
%{_bindir}/mountvboxsf
-%{_bindir}/vboxadd-timesync
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
+%{_bindir}/VBoxService
%{_libdir}/xorg/modules/drivers/*
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -343,9 +347,13 @@
%changelog
-* Wed Jul 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-4
+* Wed Jul 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-2
+- Tidy up the filelist check
- Libs need to be executable for the dep generator (#698)
+* Fri Jul 03 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
+- New upstream release
+
* Thu Jul 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-3
- Enable resize for the login window
- Add the guest udev rules
--- VirtualBox-OSE-2.2.2-strings.patch DELETED ---