rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.0.6-strings.patch, NONE, 1.1 VirtualBox-OSE-3.0.6-xorg17.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 VirtualBox-OSE.spec, 1.31, 1.32 sources, 1.7, 1.8 VirtualBox-OSE-3.0.0-strings.patch, 1.1, NONE VirtualBox-OSE-3.0.2-xinput2.patch, 1.1, NONE VirtualBox-OSE-3.0.2-xorg17.patch, 1.1, NONE VirtualBox-OSE-3.0.4-pulse0916.patch, 1.1, NONE VirtualBox-OSE-3.0.4-vblank.patch, 1.1, NONE VirtualBox-OSE-3.0.4-videodrv6.patch, 1.1, NONE

Fri Sep 11 08:59:38 CEST 2009

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4201/devel

Modified Files:
	.cvsignore VirtualBox-OSE.spec sources 
Added Files:
	VirtualBox-OSE-3.0.6-strings.patch 
	VirtualBox-OSE-3.0.6-xorg17.patch 
Removed Files:
	VirtualBox-OSE-3.0.0-strings.patch 
	VirtualBox-OSE-3.0.2-xinput2.patch 
	VirtualBox-OSE-3.0.2-xorg17.patch 
	VirtualBox-OSE-3.0.4-pulse0916.patch 
	VirtualBox-OSE-3.0.4-vblank.patch 
	VirtualBox-OSE-3.0.4-videodrv6.patch 
Log Message:
Import 3.0.6 VirtualBox-OSE


VirtualBox-OSE-3.0.6-strings.patch:

--- NEW FILE VirtualBox-OSE-3.0.6-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.

Lubomir Rintel <lkundrak at v3.sk>

diff -up VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings	2009-09-09 20:09:15.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-09-10 22:09:50.000000000 +0200
@@ -71,13 +71,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 "
- "module by executing "
- " '/etc/init.d/vboxdrv setup' "
- "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. "
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load. "
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges: "
+ " '/etc/sysconfig/modules/VirtualBox-OSE.modules' " 
 );
 
 QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -100,9 +100,9 @@ QString g_QStrHintOtherNoDriver = QAppli
 "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 -up VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh.strings	2009-09-09 20:09:47.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh	2009-09-10 22:09:50.000000000 +0200
@@ -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
 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 -up VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings	2009-09-09 20:09:48.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop	2009-09-10 22:09:51.000000000 +0200
@@ -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 -up VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp
--- VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp.strings	2009-09-09 20:10:03.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp	2009-09-10 22:09:51.000000000 +0200
@@ -334,8 +334,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
 #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
@@ -376,8 +376,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
 #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

VirtualBox-OSE-3.0.6-xorg17.patch:

--- NEW FILE VirtualBox-OSE-3.0.6-xorg17.patch ---
>From 468cc92d3d0b5a12ae0dc360f3d0b9fe8588e4f0 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 11 Sep 2009 07:57:33 +0200
Subject: [PATCH] Build drivers for XOrg 1.7 ABI

And only them.
---
 src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 26 +++++------
 src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 55 +++++++++++++++----------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index 98e44d4..c5d80ed 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -61,7 +61,7 @@ endif
 #
 # vboxmouse_drv_70
 #
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_70_DEFS = \
 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -82,7 +82,7 @@ vboxmouse_drv_70_SOURCES = \
 #
 # vboxmouse_drv_71
 #
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
 vboxmouse_drv_71_INCS := \
@@ -99,7 +99,7 @@ vboxmouse_drv_71_SOURCES = \
 #
 # vboxmouse_drv_14
 #
-DLLS += vboxmouse_drv_14
+#DLLS += vboxmouse_drv_14
 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_14_INCS := \
@@ -116,7 +116,7 @@ vboxmouse_drv_14_SOURCES = \
 #
 # vboxmouse_drv_15
 #
-DLLS += vboxmouse_drv_15
+#DLLS += vboxmouse_drv_15
 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_15_INCS := \
@@ -131,7 +131,7 @@ vboxmouse_drv_15_SOURCES = \
 #
 # vboxmouse_drv_16
 #
-DLLS += vboxmouse_drv_16
+#DLLS += vboxmouse_drv_16
 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_16_INCS := \
@@ -150,15 +150,13 @@ vboxmouse_drv_16_SOURCES = \
 DLLS += vboxmouse_drv_17
 vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 vboxmouse_drv_17_INCS := \
-	$(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-	$(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-	$(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-	$(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.15 \
+	/usr/include/pixman-1 \
+	/usr/share/xorg-x11-server-source/hw/xfree86/common \
+	/usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+	/usr/share/xorg-x11-server-source/include \
+	/usr/share/xorg-x11-server-source/mi \
+	/usr/share/xorg-x11-server-source/Xext \
 	$(PATH_SUB_CURRENT)
 vboxmouse_drv_17_SOURCES = \
 	vboxmouse_15.c
@@ -166,7 +164,7 @@ vboxmouse_drv_17_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))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 10a2936..abb7f6a 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -113,7 +113,7 @@ endif   # target linux
 #         base keywords instead of using .solaris or .linux.
 #         Also it is *important* to use := and not = when deriving a properity.
 #
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 if1of ($(KBUILD_TARGET), linux)
  vboxvideo_drv_70_CFLAGS += \
@@ -139,7 +139,7 @@ vboxvideo_drv_70_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)
@@ -158,7 +158,7 @@ vboxvideo_drv_71_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)
@@ -180,7 +180,7 @@ vboxvideo_drv_13_SOURCES = \
 # This uses the same code (vboxvideo_13.c) as 1.3, but is built
 # for 1.4 as well in case there should be any relevant header changes.
 #
-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_70_DEFS)
@@ -199,7 +199,7 @@ vboxvideo_drv_14_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_70_DEFS) NO_ANSIC PCIACCESS \
@@ -220,7 +220,7 @@ vboxvideo_drv_15_SOURCES  = \
 #
 # 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)
@@ -245,22 +245,33 @@ DLLS += vboxvideo_drv_17
 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
 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)/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)/Mesa-7.5/include \
-	$(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.15
+	/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_SOURCES  = \
 	vboxvideo_15.c \
 	vboxutils.c \
@@ -269,7 +280,7 @@ vboxvideo_drv_17_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.6.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Aug 2009 14:25:32 -0000	1.7
+++ .cvsignore	11 Sep 2009 06:59:37 -0000	1.8
@@ -1,2 +1,2 @@
-VirtualBox-3.0.4-OSE.tar.bz2
 UserManual.pdf
+VirtualBox-3.0.6-OSE.tar.bz2


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- VirtualBox-OSE.spec	1 Sep 2009 16:37:58 -0000	1.31
+++ VirtualBox-OSE.spec	11 Sep 2009 06:59:37 -0000	1.32
@@ -6,15 +6,8 @@
 # -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
 %global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
 
-# Hardening is basically a lot of seemingly useless checks that are here to
-# mitigate impact of eventual security issue in setuid root VBox. When we
-# use the filesystem capabilities instead of running privileged, it can't
-# be used.
-%if 0%{?fedora} > 11
-%bcond_with hardening
-%else
+# Do not disable hardening for anything but debugging!
 %bcond_without hardening
-%endif
 
 %if %with hardening
 %define priv_mode %%attr(4755,root,root)
@@ -23,8 +16,8 @@
 %endif
 
 Name:           VirtualBox-OSE
-Version:        3.0.4
-Release:        7%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 Summary:        A general-purpose full virtualizer for PC hardware
 
 Group:          Development/Tools
@@ -40,13 +33,9 @@
 Source8:        VirtualBox-OSE-vboxresize.desktop
 Source9:        VirtualBox-OSE.blacklist-kvm
 Patch1:         VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2:         VirtualBox-OSE-3.0.0-strings.patch
+Patch2:         VirtualBox-OSE-3.0.6-strings.patch
 Patch3:         VirtualBox-OSE-3.0.2-libcxx.patch
-Patch4:         VirtualBox-OSE-3.0.4-pulse0916.patch
-Patch5:         VirtualBox-OSE-3.0.2-xorg17.patch
-Patch6:         VirtualBox-OSE-3.0.2-xinput2.patch
-Patch7:         VirtualBox-OSE-3.0.4-videodrv6.patch
-Patch8:         VirtualBox-OSE-3.0.4-vblank.patch
+Patch5:         VirtualBox-OSE-3.0.6-xorg17.patch
 Patch9:         VirtualBox-OSE-3.0.4-optflags.patch
 Patch10:        VirtualBox-OSE-2.2.0-32bit.patch
 Patch11:        VirtualBox-OSE-3.0.4-visibility.patch
@@ -147,11 +136,7 @@
 %patch1 -p1 -b .noupdates
 %patch2 -p1 -b .strings
 %patch3 -p1 -b .libcxx
-%patch4 -p1 -b .pulse0916
 %patch5 -p1 -b .xorg17
-%patch6 -p1 -b .xinput2
-%patch7 -p1 -b .videodrv6
-%patch8 -p1 -b .vblank
 %patch9 -p1 -b .optflags
 %patch10 -p1 -b .32bit
 %patch11 -p1 -b .visibility
@@ -326,7 +311,7 @@
 # Menu entry
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
         --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
-        --vendor='' src/VBox/Installer/linux/VirtualBox.desktop
+        --vendor='' src/VBox/Installer/linux/virtualbox.desktop
 
 
 %check
@@ -450,6 +435,11 @@
 
 
 %changelog
+* Thu Sep 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.6-1
+- Bring hardening back, stupid Lubomir
+- Update to recent upstream release
+- Drop upstreamed patches for Fedora 12 Alpha support
+
 * Sat Aug 22 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-7
 - Correct the path in udev rule and adjust for non-hardening
 - Fix build with recent x86_64 glibc


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Aug 2009 14:25:32 -0000	1.7
+++ sources	11 Sep 2009 06:59:37 -0000	1.8
@@ -1,2 +1,2 @@
-70d4c7b1f271120723a16c9d2b3ba46f  VirtualBox-3.0.4-OSE.tar.bz2
-e37a6625c9048269112e96cc286aade0  UserManual.pdf
+7b9dcaa2339f122db12228c6501c2176  UserManual.pdf
+8249090b4e08ca2eff3efa9f836f370b  VirtualBox-3.0.6-OSE.tar.bz2


--- VirtualBox-OSE-3.0.0-strings.patch DELETED ---


--- VirtualBox-OSE-3.0.2-xinput2.patch DELETED ---


--- VirtualBox-OSE-3.0.2-xorg17.patch DELETED ---


--- VirtualBox-OSE-3.0.4-pulse0916.patch DELETED ---


--- VirtualBox-OSE-3.0.4-vblank.patch DELETED ---


--- VirtualBox-OSE-3.0.4-videodrv6.patch DELETED ---

