update spec

2025-02-23 17:12:46 +00:00 · 2014-05-08 01:08:06 +04:00 · 2014-05-08 01:08:06 +04:00 · cb4eb0399f
commit cb4eb0399f
parent 9e3b70dd01
15 changed files with 1 additions and 608 deletions
--- a/60-vboxadd.perms
+++ b/60-vboxadd.perms
@ -1,2 +0,0 @@
-<vboxadd>=/dev/vboxguest* /dev/vboxuser*
-<console> 0600 <vboxadd> 0600 root
--- a/VirtualBox-4.1.8-dont-check-for-mkisofs-or-makeself.patch
+++ b/VirtualBox-4.1.8-dont-check-for-mkisofs-or-makeself.patch
@ -1,21 +0,0 @@
-diff -Nurp VirtualBox-4.1.8_OSE-p5/configure VirtualBox-4.1.8_OSE-p9/configure
--- VirtualBox-4.1.8_OSE-p5/configure	2011-12-24 15:18:03.271635525 +0200
-+++ VirtualBox-4.1.8_OSE-p9/configure	2011-12-24 15:42:37.404156620 +0200
-@@ -2549,7 +2549,7 @@ check_gcc
- # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
- # [ "$OS" != "darwin" ] && check_yasm
- [ "$OS" != "darwin"  ] && check_xsltproc
-[ "$OS" != "darwin"  ] && check_mkisofs
-+#[ "$OS" != "darwin"  ] && check_mkisofs
- 
- # the libraries
- [ "$OS" != "darwin"  ] && check_pthread
-@@ -2607,7 +2607,7 @@ if [ "$OS" = "linux" ]; then
-   check_compiler_h
-   [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
-   # tools/common/makeself*
-  [ $OSE -ge 1 ] && check_makeself
-+ # [ $OSE -ge 1 ] && check_makeself
- fi
- 
- [ -n "$SETUP_WINE" ] && setup_wine
--- a/VirtualBox-4.1.8-futex.patch
+++ b/VirtualBox-4.1.8-futex.patch
@ -1,12 +0,0 @@
-diff -Nurp VirtualBox-4.1.8_OSE-p2/src/VBox/Runtime/r3/linux/semmutex-linux.cpp VirtualBox-4.1.8_OSE-p3/src/VBox/Runtime/r3/linux/semmutex-linux.cpp
--- VirtualBox-4.1.8_OSE-p2/src/VBox/Runtime/r3/linux/semmutex-linux.cpp	2011-12-19 15:01:33.000000000 +0200
-+++ VirtualBox-4.1.8_OSE-p3/src/VBox/Runtime/r3/linux/semmutex-linux.cpp	2011-12-24 15:25:16.791196405 +0200
-@@ -88,7 +88,7 @@ struct RTSEMMUTEXINTERNAL
- static long sys_futex(int32_t volatile *uaddr, int op, int val, struct timespec *utime, int32_t *uaddr2, int val3)
- {
-     errno = 0;
-    long rc = syscall(__NR_futex, uaddr, op, val, utime, uaddr2, val3);
-+    long rc = syscall(SYS_futex, uaddr, op, val, utime, uaddr2, val3);
-     if (rc < 0)
-     {
-         Assert(rc == -1);
--- a/VirtualBox-4.1.8-initscriptname.patch
+++ b/VirtualBox-4.1.8-initscriptname.patch
@ -1,21 +0,0 @@
-diff -Nurp VirtualBox-4.1.8_OSE-p4/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.8_OSE-p5/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-4.1.8_OSE-p4/src/VBox/Installer/linux/VBox.sh	2011-12-19 15:01:10.000000000 +0200
-+++ VirtualBox-4.1.8_OSE-p5/src/VBox/Installer/linux/VBox.sh	2011-12-24 15:28:55.036010629 +0200
-@@ -34,7 +34,7 @@ WARNING: The vboxdrv kernel module is no
-          available for the current kernel (`uname -r`) or it failed to
-          load. Please recompile the kernel module and install it by
- 
-           sudo /etc/init.d/vboxdrv setup
-+           sudo /etc/rc.d/init.d/virtualbox start
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
-@@ -42,7 +42,7 @@ elif [ ! -c /dev/vboxdrv ]; then
-     cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
- 
-           sudo /etc/init.d/vboxdrv restart
-+           sudo /etc/rc.d/init.d/virtualbox restart
- 
-          and if that is not successful, try to re-install the package.
- 
--- a/VirtualBox-4.1.8-kernelrelease.patch
+++ b/VirtualBox-4.1.8-kernelrelease.patch
@ -1,30 +0,0 @@
-diff -Nurp VirtualBox-4.1.8_OSE-p1/src/VBox/HostDrivers/Support/linux/Makefile VirtualBox-4.1.8_OSE-p2/src/VBox/HostDrivers/Support/linux/Makefile
--- VirtualBox-4.1.8_OSE-p1/src/VBox/HostDrivers/Support/linux/Makefile	2011-12-19 15:01:06.000000000 +0200
-+++ VirtualBox-4.1.8_OSE-p2/src/VBox/HostDrivers/Support/linux/Makefile	2011-12-24 15:22:08.487043179 +0200
-@@ -165,7 +165,7 @@ ifeq ($(KERNELRELEASE),)
-  # kernel base directory
-  ifndef KERN_DIR
-   # build for the current kernel, version check
-  KERN_DIR := /lib/modules/$(shell uname -r)/build
-+  KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
-   ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-    KERN_DIR := /usr/src/linux
-    ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-@@ -194,7 +194,7 @@ ifeq ($(KERNELRELEASE),)
-  # module install dir, only for current kernel
-  ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-   ifndef MODULE_DIR
-   MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-+   MODULE_DIR_TST := /lib/modules/$(KERNELRELEASE)
-    ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-     MODULE_DIR := $(MODULE_DIR_TST)/misc
-    else
-@@ -286,7 +286,7 @@ install_rpm: $(MODULE)
- else # eq ($(MAKECMDGOALS),clean)
- 
-  ifndef KERN_DIR
-  KERN_DIR := /lib/modules/$(shell uname -r)/build
-+  KERN_DIR := /lib/modules/$(KERNELRELEASE)/build
-   ifeq ($(wildcard $(KERN_DIR)/Makefile),)
-    KERN_DIR := /usr/src/linux
-   endif
--- a/VirtualBox-4.1.8-usb-warning-filters.patch
+++ b/VirtualBox-4.1.8-usb-warning-filters.patch
@ -1,19 +0,0 @@
--- ./src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.usb	2012-09-20 23:43:00.716556922 -0300
-+++ ./src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2012-09-20 23:45:03.484555275 -0300
-@@ -55,6 +55,7 @@
- 
- /* COM includes: */
- #include "CUSBController.h"
-+#include "CUSBDeviceFilter.h"
- 
- #if 0 /* Global USB filters are DISABLED now: */
- # define ENABLE_GLOBAL_USB
-@@ -1107,7 +1108,7 @@ bool UISettingsDialogMachine::isPageAvai
-             /* Get the USB controller object: */
-             CUSBController controller = m_machine.GetUSBController();
-             /* Show the machine error message if any: */
-            if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled())
-+            if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled() && (controller.GetDeviceFilters().size() != 0))
-                 msgCenter().cannotAccessUSB(m_machine);
-             /* Check if USB is implemented: */
-             if (controller.isNull() || !controller.GetProxyAvailable())
--- a/VirtualBox-4.2.12-gsoap-2.8.13.patch
+++ b/VirtualBox-4.2.12-gsoap-2.8.13.patch
@ -1,11 +0,0 @@
--- a/src/VBox/Main/webservice/Makefile.kmk.orig	2013-05-13 18:43:42.492674768 +0100
-+++ b/src/VBox/Main/webservice/Makefile.kmk	2013-05-13 18:43:51.484674243 +0100
-@@ -650,7 +650,7 @@
- : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
- 	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
- 	$(RM) -f $@
-	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
-+	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
- 	$(APPEND) $@ done
- 
- # copy the generated headers and stuff. This has to be a separate rule if we
--- a/VirtualBox-4.2.2-remove-missing-translation.patch
+++ b/VirtualBox-4.2.2-remove-missing-translation.patch
@ -1,20 +0,0 @@
--- VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk~	2012-10-18 16:22:52.000000000 +0200
-+++ VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk	2012-10-25 09:53:33.962193785 +0200
-@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
- 	de    \
- 	en    \
- 	es    \
-	fa_IR \
- 	hu    \
- 	it    \
- 	ja    \
--- VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/VBoxUI.pro~	2012-10-18 16:22:47.000000000 +0200
-+++ VirtualBox-4.2.2/src/VBox/Frontends/VirtualBox/VBoxUI.pro	2012-10-25 09:53:10.003887784 +0200
-@@ -63,7 +63,6 @@ TRANSLATIONS = \
- 	nls/VirtualBox_es.ts \
- 	nls/VirtualBox_eu.ts \
- 	nls/VirtualBox_fi.ts \
-	nls/VirtualBox_fa_IR.ts \
- 	nls/VirtualBox_fr.ts \
- 	nls/VirtualBox_gl_ES.ts \
- 	nls/VirtualBox_hu.ts \
--- a/VirtualBox-4.3.8-system-xorg.patch
+++ b/VirtualBox-4.3.8-system-xorg.patch
@ -1,281 +0,0 @@
--- VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2014-02-25 17:00:33.000000000 +0000
-+++ VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-03-03 23:38:54.833100349 +0000
-@@ -58,7 +58,6 @@
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_CFLAGS += -Wno-shadow # Avoid MBs of warnings in X11 and OpenGL headers (solaris mostly).
-@@ -134,7 +133,6 @@
- #         base keywords instead of using .solaris or .linux.
- #         Also it is *important* to use := and not = when deriving a property.
- #
-DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700000000
- ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
-@@ -151,7 +149,6 @@
- #
- # 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_70_DEFS) XORG_VERSION_CURRENT=700100000
-@@ -166,7 +163,6 @@
- #
- # 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_13_DEFS) XORG_VERSION_CURRENT=100300000
-@@ -180,7 +176,6 @@
- #
- # 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_13_DEFS) XORG_VERSION_CURRENT=100400000
-@@ -194,7 +189,6 @@
- #
- # 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_15_DEFS) XORG_VERSION_CURRENT=100503000
-@@ -216,7 +210,6 @@
- #
- # 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_15_DEFS) XORG_VERSION_CURRENT=100600000
-@@ -234,7 +227,6 @@
- #
- # vboxvideo_drv_17
- #
-DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-@@ -252,7 +244,6 @@
- #
- # 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_15_DEFS) XORG_VERSION_CURRENT=100800000
-@@ -266,7 +257,6 @@
- #
- # 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_15_DEFS) XORG_VERSION_CURRENT=100900000
-@@ -280,7 +270,6 @@
- #
- # vboxvideo_drv_110
- #
-DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-@@ -294,7 +283,6 @@
- #
- # vboxvideo_drv_111
- #
-DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-@@ -308,7 +296,6 @@
- #
- # vboxvideo_drv_112
- #
-DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-@@ -322,7 +309,6 @@
- #
- # vboxvideo_drv_113
- #
-DLLS += vboxvideo_drv_113
- vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
-@@ -332,6 +318,20 @@
- vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
- vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_17_SOURCES)
- 
-+#
-+# build only for selected server
-+#
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/xorg \
-+	/usr/include/x11 \
-+	/usr/include/pixman-1 \
-+	/usr/include/X11/dri \
-+	/usr/include/drm \
-+	/usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
- 
- #
- # vboxvideo_drv_114
--- VirtualBox-4.3.8/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig	2014-02-25 17:00:33.000000000 +0000
-+++ VirtualBox-4.3.8/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2014-03-03 23:38:54.846100350 +0000
-@@ -29,7 +29,6 @@
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -69,7 +68,6 @@
- #
- # vboxmouse_drv_70
- #
-DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-@@ -85,7 +83,6 @@
- #
- # vboxmouse_drv_71
- #
-DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_71_INCS := \
-@@ -100,7 +97,6 @@
- #
- # vboxmouse_drv_13
- #
-DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -114,7 +110,6 @@
- #
- # 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 := \
-@@ -128,7 +123,6 @@
- #
- # 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 := \
-@@ -142,7 +136,6 @@
- #
- # 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 := \
-@@ -158,7 +151,6 @@
- #
- # vboxmouse_drv_17
- #
-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
-@@ -173,7 +165,6 @@
- #
- # vboxmouse_drv_18
- #
-DLLS += vboxmouse_drv_18
- vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -188,7 +179,6 @@
- #
- # vboxmouse_drv_19
- #
-DLLS += vboxmouse_drv_19
- vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -203,7 +193,6 @@
- #
- # vboxmouse_drv_110
- #
-DLLS += vboxmouse_drv_110
- vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -214,7 +203,6 @@
- vboxmouse_drv_110_SOURCES = \
- 	vboxmouse.c
- 
-DLLS += vboxmouse_drv_111
- vboxmouse_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -225,7 +213,6 @@
- vboxmouse_drv_111_SOURCES = \
- 	vboxmouse.c
- 
-DLLS += vboxmouse_drv_112
- vboxmouse_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -236,6 +223,13 @@
- vboxmouse_drv_112_SOURCES = \
- 	vboxmouse.c
- 
-+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
-+       /usr/include/x11 \
-+       /usr/include/xorg \
-+       /usr/include/pixman-1
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+
- endif # neq ($(KBUILD_TARGET),linux)
- 
- 
--- VirtualBox-4.3.8/src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2014-02-25 17:00:28.000000000 +0000
-+++ VirtualBox-4.3.8/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2014-03-03 23:38:54.832100349 +0000
-@@ -74,18 +74,12 @@
- 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)/libXext-1.3.1 \
-	$(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)/xextproto-7.1.1 \
-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+	/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
- 
--- a/virtualbox-default-to-mandriva.patch
+++ b/virtualbox-default-to-mandriva.patch
@ -1,19 +0,0 @@
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp.orig	2014-03-03 23:50:59.529129676 +0000
-+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2014-03-03 23:51:25.911130743 +0000
-@@ -206,12 +206,12 @@
-     /* Or select Ubuntu item for Linux family as default: */
-     else if (strFamilyId == "Linux")
-     {
-        QString strDefaultID = "Ubuntu";
-+        QString strDefaultID = "Mandriva";
-         if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
-             strDefaultID += "_64";
-        int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID);
-        if (iIndexUbuntu != -1)
-            m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
-+        int iIndexMandriva = m_pTypeCombo->findData(strDefaultID, TypeID);
-+        if (iIndexMandriva != -1)
-+            m_pTypeCombo->setCurrentIndex(iIndexMandriva);
-     }
-     /* Else simply select the first one present: */
-     else m_pTypeCombo->setCurrentIndex(0);
--- a/virtualbox-fix-vboxadd-req.patch
+++ b/virtualbox-fix-vboxadd-req.patch
@ -1,17 +0,0 @@
--- VirtualBox-4.1.2_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh.0004~	2011-08-15 14:28:49.000000000 +0200
-+++ VirtualBox-4.1.2_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh	2011-08-17 21:33:39.000000000 +0200
-@@ -18,10 +18,12 @@
- #
- ### BEGIN INIT INFO
- # Provides:       vboxadd-service
-# Required-Start: vboxadd
-# Required-Stop:  vboxadd
-+# Should-Start:   dkms
- # Default-Start:  2 3 4 5
- # Default-Stop:   0 1 6
-+# Required-Start:
-+# Required-Stop:
-+# Short-Description: VirtualBox Additions Service
- # Description:    VirtualBox Additions Service
- ### END INIT INFO
- 
--- a/virtualbox-xorg-1.15.patch
+++ b/virtualbox-xorg-1.15.patch
@ -1,32 +0,0 @@
--- VirtualBox-4.3.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.omv~	2014-01-07 20:04:54.055844804 +0100
-+++ VirtualBox-4.3.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-01-07 20:05:38.872512062 +0100
-@@ -333,6 +333,20 @@ vboxvideo_drv_114_INCS += $(PATH_ROOT)/s
- vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_15_SOURCES)
- 
- 
-+#
-+# vboxvideo_drv_115
-+#
-+DLLS += vboxvideo_drv_115
-+vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
-+vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-+vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
-+vboxvideo_drv_115_INCS = \
-+	$(vboxvideo_xorg_INCS) \
-+	/usr/include/xorg
-+vboxvideo_drv_115_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_15_SOURCES)
-+
-+
- # 32-bit modules for the 64-bit Linux Additions
- ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
-  ifneq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
-@@ -399,7 +413,7 @@ $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo6
- 	$$(QUIET)$$(APPEND) -t "$$@" "done"
-     endef
- 
-    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114, $(eval $(def_vboxvideo_test)))
-+    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115, $(eval $(def_vboxvideo_test)))
- 
-     endif # ! VBOX_ONLY_SDK
-    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--- a/virtualbox.init
+++ b/virtualbox.init
@ -1,114 +0,0 @@
-#! /bin/sh
-#
-# virtualbox: Starts the VirtualBox kernel module
-#
-# chkconfig: 35 30 60
-# description: VirtualBox Linux kernel module
-#
-### BEGIN INIT INFO
-# Provides:       vboxdrv
-# Required-Start: $syslog
-# Required-Stop:
-# Default-Start:  3 5
-# Default-Stop:
-# Description:    VirtualBox Linux kernel module
-# Should-Start:   dkms
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-DAEMON=virtualbox
-PROGNAME=VBoxSVC
-
-RETVAL=0
-
-running() {
-    grep -q "^$1 " /proc/modules
-}
-
-start() {
-    # Check if it is already running
-    if ! running vboxdrv; then
-	gprintf "Starting %s daemon: " "$DAEMON"
-        if ! modprobe vboxdrv > /dev/null 2>&1; then
-            failure "Loading vboxdrv module:"
-	    return
-        fi
-	if ! modprobe vboxnetflt > /dev/null 2>&1; then
-	    failure "Loading vboxnetflt module:"
-	    return
-	fi
-    	if ! modprobe vboxnetadp > /dev/null 2>&1; then
-            failure "Loading vboxnetadp module:"
-	    return
-    	fi
-	touch /var/lock/subsys/$PROGNAME
-	success
-    fi
-    echo
-}
-
-stop() {
-    gprintf "Stopping %s daemon: " "$DAEMON"
-    if running vboxdrv; then
-        if running vboxnetflt; then
-            if ! rmmod vboxnetflt 2>/dev/null; then
-                failure "Remove module vboxnetflt:"
-		return
-            fi
-        fi
-	if running vboxnetadp; then
-	    if ! rmmod vboxnetadp 2>/dev/null; then
-		failure "Remove module vboxnetadp:"
-		return
-	    fi
-	fi
-        if ! rmmod vboxdrv 2>/dev/null; then
-            failure "Remove module vboxdrv:"
-	    return
-        fi
-    fi
-    success
-    echo
-}
-
-restart() {
-    stop
-    start
-}
-
-status() {
-    if running vboxdrv; then
-	STATUS="loaded"
-    else
-	STATUS="not loaded"
-    fi
-    gprintf "%s kernel module is %s\n" $DAEMON "$STATUS"
-}
-
-case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    restart)
-	restart
-	;;
-    condrestart)
-	if [ -f /var/lock/subsys/$PROGNAME ]; then
-	    restart
-	fi
-        ;;
-    status)
-	status
-	;;
-    *)
-	INITNAME=`basename $0`
-	gprintf "Usage: %s {start|stop|restart|condrestart|status}\n" "$INITNAME"
-	exit 1
-	;;
-esac
-exit $RETVAL
--- a/virtualbox.rpmlintrc
+++ b/virtualbox.rpmlintrc
@ -1,8 +0,0 @@
-# Whether or not those are intentional needs further investigation
-# virtualbox.x86_64: E: unstripped-binary-or-object (Badness: 50) /usr/lib64/virtualbox/VMMR0.r0
-# virtualbox.x86_64: E: unstripped-binary-or-object (Badness: 50) /usr/lib64/virtualbox/VBoxDD2GC.gc
-# virtualbox.x86_64: E: unstripped-binary-or-object (Badness: 50) /usr/lib64/virtualbox/VBoxDDGC.gc
-# virtualbox.x86_64: E: unstripped-binary-or-object (Badness: 50) /usr/lib64/virtualbox/VMMGC.gc
-# virtualbox.x86_64: E: unstripped-binary-or-object (Badness: 50) /usr/lib64/virtualbox/VBoxDD2R0.r0
-# virtualbox.x86_64: E: unstripped-binary-or-object (Badness: 50) /usr/lib64/virtualbox/VBoxDDR0.r0
-addFilter("E: unstripped-binary-or-object")
--- a/virtualbox.spec
+++ b/virtualbox.spec
@ -114,7 +114,7 @@ BuildConflicts:	rpmlint < 1.4-37

 Requires(post,preun,postun): rpm-helper
 Requires:	kmod(vboxdrv) = %{version}
-Suggests:	%{name}-doc
+#Suggests:	%{name}-doc

 %description
 VirtualBox is a general-purpose full virtualizer for x86 hardware.