rpms/VirtualBox-OSE/F-15 VirtualBox-OSE-4.1.4-noupdate.patch, NONE,
1.1 VirtualBox-OSE-4.1.4-xorg17.patch, NONE,
1.1 VirtualBox-OSE-4.1.6-strings.patch, NONE, 1.1 .cvsignore,
1.29, 1.30 VirtualBox-OSE.spec, 1.70, 1.71 sources, 1.29,
1.30 VirtualBox-OSE-4.0.2-strings.patch, 1.1,
NONE VirtualBox-OSE-4.0.2-xorg17.patch, 1.1,
NONE VirtualBox-OSE-4.1.2-noupdate.patch, 1.1,
NONE VirtualBox-OSE-4.1.2-vboxpci.patch, 1.1, NONE
Sérgio M. Basto
sergiomb at rpmfusion.org
Sat Dec 24 05:02:19 CET 2011
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16809
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-4.1.4-noupdate.patch
VirtualBox-OSE-4.1.4-xorg17.patch
VirtualBox-OSE-4.1.6-strings.patch
Removed Files:
VirtualBox-OSE-4.0.2-strings.patch
VirtualBox-OSE-4.0.2-xorg17.patch
VirtualBox-OSE-4.1.2-noupdate.patch
VirtualBox-OSE-4.1.2-vboxpci.patch
Log Message:
* Sat Dec 24 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-1
- New release
- drop up streamed patch VirtualBox-OSE-4.1.2-vboxpci.patch
- fix strings patch
- add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch bz #1656
- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch)
- redo noupdate patch.
- disable java binding seems non maintained.
- some cleanups.
- bug #2052, drop requirement of HAL in Fedora >= 16.
- bug #2040, is also fixed (update to 4.1.6).
- Now rawhide needs explicit BuildRequires libpng-devel
- complete list of commands of VBox command line based on
src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups.
- add source vboxweb-service to package.
- merge spec 4.0.4 from Lubomir Rintel <lkundrak at v3.sk>, which re-add BuildRequires: hal-devel on F-15.
VirtualBox-OSE-4.1.4-noupdate.patch:
UIUpdateDefs.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-4.1.4-noupdate.patch ---
>From 631f2a6aa525f51fa38a3b59550d80e452181e5f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 11:53:40 +0200
Subject: [PATCH 1/4] Disable automatic check for updates
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
---
.../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
--- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2011-10-03 23:27:27.022252299 +0100
+++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2011-10-03 23:27:37.597338185 +0100
@@ -138,7 +138,7 @@
if (m_dayList.isEmpty())
populate();
PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
- m_periodIndex = index == PeriodUndefined ? Period1Day : index;
+ m_periodIndex = index == PeriodUndefined ? PeriodNever : index;
}
/* Parse 'date' value: */
VirtualBox-OSE-4.1.4-xorg17.patch:
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 +----
b/src/VBox/Additions/x11/Makefile.kmk | 4 +
b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 17 +++++-
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 59 +++++++++++++---------
4 files changed, 58 insertions(+), 36 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.4-xorg17.patch ---
Based:
Description: Build the X.Org driver only for the selected system X Server version.
Author: Michael Meskes <meskes at debian.org>, Felix Geyer <debfx-pkg at fobos.de>
diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/1.3/xorg \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
--- a/src/VBox/Additions/x11/Makefile.kmk
+++ b/src/VBox/Additions/x11/Makefile.kmk
@@ -17,6 +17,10 @@
SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
+ XSERVER_VERSION := 17
+endif
+
# Include sub-makefiles.
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -56,6 +56,18 @@
endif
+ifeq ($(KBUILD_TARGET), linux)
+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
+vboxmouse_drv_$(XSERVER_VERSION)_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_$(XSERVER_VERSION)_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
+ NO_ANSIC
+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
+vboxmouse_drv_$(XSERVER_VERSION) = \
+ vboxmouse_15.c
+else
#
# vboxmouse_drv_70
#
@@ -154,7 +166,6 @@
vboxmouse_15.c
-ifneq ($(KBUILD_TARGET), linux)
#
# vboxmouse_drv_17
@@ -256,6 +267,8 @@
$(QUIET)$(APPEND) -t "$@" "done"
endif
+ifneq ($(KBUILD_TARGET), linux)
+
TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
$$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(vboxmouse_drv_70_1_STAGE_TARGET)
@@ -304,8 +317,6 @@
$(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15
$(QUIET)$(APPEND) -t "$@" "done"
-ifneq ($(KBUILD_TARGET), linux)
-
TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET)
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -89,7 +89,7 @@ vboxvideo_drv_SOURCES = \
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a property.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -112,7 +112,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_71
#
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -127,7 +127,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_13
#
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
@@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_14
#
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
@@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_15
#
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
@@ -192,7 +192,7 @@ endif
#
# vboxvideo_drv_16
#
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
@@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
#
# vboxvideo_drv_18
#
-DLLS += vboxvideo_drv_18
+#DLLS += vboxvideo_drv_18
vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
#
# vboxvideo_drv_19
#
-DLLS += vboxvideo_drv_19
+#DLLS += vboxvideo_drv_19
vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -292,7 +304,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.7.3.4
VirtualBox-OSE-4.1.6-strings.patch:
b/src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
b/src/VBox/VMM/VMMR3/VM.cpp | 9 ++++-----
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.6-strings.patch ---
>From 3a6d9a3d4f8d9084759fe871033b6b4a990aa761 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
With ones that (sometimes) make more sense.
---
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
src/VBox/VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 20 insertions(+), 19 deletions(-)
--- a/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-05 07:16:19.000000000 +0000
+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-12 03:13:48.210675902 +0000
@@ -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. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. If it is available in your distribution, you 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(
@@ -92,7 +92,7 @@
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
"may correct this. Make sure that you do not mix the "
"OSE version and the PUEL version of VirtualBox."
);
@@ -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(
- "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 --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh
index 9319696..0e782e0 100644
--- a/src/VBox/Installer/linux/VBox.sh
+++ b/src/VBox/Installer/linux/VBox.sh
@@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then
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 --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp
index d9e1bc1..c24f8dd 100644
--- a/src/VBox/VMM/VMMR3/VM.cpp
+++ b/src/VBox/VMM/VMMR3/VM.cpp
@@ -363,8 +363,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
#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
@@ -405,8 +405,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
#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
--
1.7.3.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 27 Nov 2011 22:03:30 -0000 1.29
+++ .cvsignore 24 Dec 2011 04:02:18 -0000 1.30
@@ -1 +1 @@
-VirtualBox-4.1.2.tar.bz2
+VirtualBox-4.1.6.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- VirtualBox-OSE.spec 27 Nov 2011 22:03:30 -0000 1.70
+++ VirtualBox-OSE.spec 24 Dec 2011 04:02:18 -0000 1.71
@@ -14,7 +14,7 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox-OSE
-Version: 4.1.2
+Version: 4.1.6
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -29,10 +29,10 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
Source10: vboxweb-service
-Patch1: VirtualBox-OSE-4.1.2-noupdate.patch
-Patch2: VirtualBox-OSE-4.0.2-strings.patch
+Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
+Patch2: VirtualBox-OSE-4.1.6-strings.patch
Patch3: VirtualBox-OSE-4.1.2-libcxx.patch
-Patch5: VirtualBox-OSE-4.0.2-xorg17.patch
+Patch5: VirtualBox-OSE-4.1.4-xorg17.patch
Patch9: VirtualBox-OSE-3.2.4-optflags.patch
Patch10: VirtualBox-OSE-4.0.0-32bit.patch
Patch11: VirtualBox-OSE-3.2.0-visibility.patch
@@ -41,16 +41,18 @@
Patch16: VirtualBox-OSE-4.1.2-usblib.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch19: VirtualBox-OSE-4.1.2-vboxpci.patch
-Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
+Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kBuild >= 0.1.98
BuildRequires: SDL-devel xalan-c-devel
+%if 0%{?fedora} < 16
+BuildRequires: hal-devel
+%endif
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
+BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel libXcomposite-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: libXmu-devel
@@ -64,6 +66,7 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+BuildRequires: libpng-devel
# For the X11 module
BuildRequires: libdrm-devel
@@ -120,16 +123,18 @@
Group: System Environment/Base
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
+%if 0%{?fedora} < 16
Requires: hal
+%endif
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
Conflicts: %{name} <= %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
-Requires: %(xserver-sdk-abi-requires ansic)
-Requires: %(xserver-sdk-abi-requires videodrv)
-Requires: %(xserver-sdk-abi-requires xinput)
+Requires: %(xserver-sdk-abi-requires ansic)
+Requires: %(xserver-sdk-abi-requires videodrv)
+Requires: %(xserver-sdk-abi-requires xinput)
%endif
@@ -164,7 +169,6 @@
%patch16 -p1 -b .usblib
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
-%patch19 -p1 -b .vboxpci
%patch20 -p1 -b .testmangle
# Remove prebuilt binary tools
@@ -176,7 +180,7 @@
%build
-./configure --disable-kmods --enable-webservice
+./configure --disable-kmods --enable-webservice --disable-java
. ./env.sh
# VirtualBox build system installs and builds in the same step,
@@ -218,13 +222,20 @@
# Binaries and Wrapper with Launchers
install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/virtualbox
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxmanage
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxsdl
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/VBoxTunctl \
@@ -259,18 +270,12 @@
obj/bin/VBoxSysInfo.sh \
obj/bin/vboxshell.py \
obj/bin/VBoxTestOGL \
+ obj/bin/VBoxExtPackHelperApp \
obj/bin/vboxwebsrv \
obj/bin/VBoxBalloonCtrl \
obj/bin/webtest \
obj/bin/VBoxBFE
-# Lowercase aliases
-for F in VBoxBalloonCtrl VBoxHeadless VBoxManage VBoxSDL VirtualBox VBoxBFE
-do
- ln $RPM_BUILD_ROOT%{_bindir}/$F \
- $RPM_BUILD_ROOT%{_bindir}/$(echo $F |awk '{print tolower($0)}')
-done
-
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
obj/bin/nls/*
@@ -286,7 +291,7 @@
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
-ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
+#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
@@ -309,10 +314,6 @@
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
-# This is no longer needed for a more recent Xorg, since evdev uses udev
-install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
- $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
-
# Guest tools
install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/additions/mount.vboxsf \
@@ -324,6 +325,9 @@
install -m 0755 -D %{SOURCE9} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+install -m 0755 -D %{SOURCE10} \
+ $RPM_BUILD_ROOT%{_initrddir}/%{SOURCE10}
+
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -368,11 +372,6 @@
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' obj/bin/virtualbox.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
@@ -428,12 +427,14 @@
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
%{_bindir}/vboxwebsrv
+%{_bindir}/VBoxVRDP
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
%{_libdir}/virtualbox/nls
+%{_libdir}/virtualbox/VBoxExtPackHelperApp
%{_libdir}/virtualbox/VBoxManage
%{_libdir}/virtualbox/VBoxSVC
%{_libdir}/virtualbox/VBoxTestOGL
@@ -456,6 +457,7 @@
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
+%attr(755,root,root) %{_initrddir}/*
%files devel
@@ -483,7 +485,6 @@
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
-%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
@@ -495,11 +496,28 @@
%changelog
+* Sat Dec 24 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-1
+- New release
+- drop up streamed patch VirtualBox-OSE-4.1.2-vboxpci.patch
+- fix strings patch
+- add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch bz #1656
+- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch)
+- redo noupdate patch.
+- disable java binding seems non maintained.
+- some cleanups.
+- bug #2052, drop requirement of HAL in Fedora >= 16.
+- bug #2040, is also fixed (update to 4.1.6).
+- Now rawhide needs explicit BuildRequires libpng-devel
+- complete list of commands of VBox command line based on
+ src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups.
+- add source vboxweb-service to package.
+- merge spec 4.0.4 from Lubomir Rintel <lkundrak at v3.sk>, which re-add BuildRequires: hal-devel on F-15.
+
* Sun Nov 27 2011 Sérgio Basto <sergio at serjux.com> - 4.1.2-1
- fix bug #1877, the fix is update VirtualBox-OSE to 4.1.x
- small fix for bug #1979.
-- from 4.1.2.f16 Lubomir Rintel <lkundrak at v3.sk>
- - New release Lubomir
+- from .f16 * Wed Sep 21 2011 Lubomir Rintel <lkundrak at v3.sk> - 4.1.2-1
+ - New release
- Assign USB devices to vboxusers
- Add a web service
- Install MIME types for disk images
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 27 Nov 2011 22:03:30 -0000 1.29
+++ sources 24 Dec 2011 04:02:18 -0000 1.30
@@ -1 +1 @@
-945d2c94c15a4f47280be4b01b67e244 VirtualBox-4.1.2.tar.bz2
+89b979d1b817242c7cdcb489898f166a VirtualBox-4.1.6.tar.bz2
--- VirtualBox-OSE-4.0.2-strings.patch DELETED ---
--- VirtualBox-OSE-4.0.2-xorg17.patch DELETED ---
--- VirtualBox-OSE-4.1.2-noupdate.patch DELETED ---
--- VirtualBox-OSE-4.1.2-vboxpci.patch DELETED ---
More information about the rpmfusion-commits
mailing list