Update to 4.3.6, support Xorg 1.15, conflict with old rpmlint

.abf.yml

@@ -1,3 +1,3 @@
 sources:
   UserManual.pdf: 97f742e0fef4cd881dac721c96eab309a4cb4396
-  VirtualBox-4.3.0.tar.bz2: 7dc0770d94d089d9629db041c74eafa64b4de937
+  VirtualBox-4.3.6.tar.bz2: 4c6c984d6244b7bc858949a81f47e7892e843725

virtualbox-xorg-1.15.patch

@@ -0,0 +1,32 @@
+--- 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))

virtualbox.spec

@@ -26,8 +26,8 @@
 
 Summary:	A general-purpose full virtualizer for x86 hardware
 Name:		virtualbox
-Version:	4.3.0
+Version:	4.3.6
-Release:	6
+Release:	1
 License:	GPLv2
 Group:		Emulators
 Url:		http://www.virtualbox.org/
@@ -36,6 +36,7 @@ Source1:	http://dlc.sun.com.edgesuite.net/virtualbox/UserManual.pdf
 Source2:	virtualbox.init
 Source4:	60-vboxadd.perms
 Source100:	virtualbox.rpmlintrc
+Patch1:		virtualbox-xorg-1.15.patch
 Patch2:		VirtualBox-4.1.8-kernelrelease.patch
 Patch3:		VirtualBox-4.1.8-futex.patch
 Patch4:		virtualbox-fix-vboxadd-req.patch
@@ -68,7 +69,7 @@ BuildRequires:	dkms-minimal
 BuildRequires:	gawk
 BuildRequires:	gsoap
 BuildRequires:	iasl
-BuildRequires:	java-1.7.0-openjdk-devel
+BuildRequires:	java-1.6.0-openjdk-devel
 BuildRequires:	qt4-linguist
 BuildRequires:	xsltproc
 BuildRequires:	libcap-devel
@@ -109,6 +110,8 @@ BuildRequires:	texlive-fontsextra
 %endif
 BuildRequires:	docbook-dtd44-xml
 %endif
+# bogus devel-file-in-non-devel-package errors in dkms subpackage
+BuildConflicts:	rpmlint < 1.4-37
 
 Requires(post,preun,postun): rpm-helper
 Requires:	kmod(vboxdrv) = %{version}
@@ -187,7 +190,7 @@ VBOX_PATH_APP_PRIVATE:=%{vboxlibdir}
 VBOX_WITH_VNC:=1
 VBOX_WITH_TESTCASES =
 VBOX_WITH_TESTSUITE:=
-VBOX_JAVA_HOME := /usr/lib/jvm/java-1.7.0
+VBOX_JAVA_HOME := /usr/lib/jvm/java-1.6.0
 VBOX_WITHOUT_ADDITIONS_ISO := 1
 EOF
 
@@ -212,7 +215,9 @@ echo VBOX_GCC_OPT="%{optflags}" >> LocalConfig.kmk
 %endif
 echo TOOL_GCC_LDFLAGS="%{ldflags}" >> LocalConfig.kmk
 
-%if !%{build_additions}
+%if %{build_additions}
+echo XSERVER_VERSION=%{x11_server_majorver} >>LocalConfig.kmk
+%else
 sed -rie 's/(VBOX_WITH_LINUX_ADDITIONS\s+:=\s+).*/\1/' AutoConfig.kmk
 echo VBOX_WITHOUT_ADDITIONS=1 >> LocalConfig.kmk
 %endif
@@ -330,7 +335,7 @@ pushd out/%{vbox_platform}/release/bin/additions
 vboxguest
 EOF
 
-  install vboxvideo_drv_%{x11_server_majorver}.so -D %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+  install vboxvideo_drv.so -D %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 
   mkdir -p %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}
   cat > %{buildroot}%{_usr}/src/vboxadditions-%{version}-%{release}/dkms.conf << EOF