X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=f21adb1569089d44d8e8e8f550eff13d970580b8;hb=ece7f2f1750293d06f06535ee882ca0567c7de89;hp=5ba948f28400430f4caf30a4c6bb476c9df2ae64;hpb=55f7d7d30785c6b50752a007e26443c8808d7ca6;p=packages%2FVirtualBox.git

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 5ba948f..f21adb1 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,7 +1,5 @@
-#
 # TODO
 # - java bindings
-# - Find how to compile with PLD CFLAGS/CXXFLAGS/LDFLAGS.
 # - Package SDK.
 # - Package utils (and write initscripts ?) for Guest OS.
 # - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2.
@@ -17,8 +15,8 @@
 %bcond_without	kernel		# don't build kernel module
 %bcond_without	userspace	# don't build userspace package
 %bcond_with	webservice	# webservice (soap) support
+%bcond_without	verbose
 %bcond_with	force_userspace # force userspace build (useful if alt_kernel is set)
-%bcond_with	verbose
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -39,14 +37,14 @@
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{_alt_kernel}
-Version:	4.2.4
+Version:	4.2.10
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5:	d1ec2d2a3f2f3f0b277dfe2c520c2e33
+# Source0-md5:	99349df34caacdecbb7cf3908631c3f3
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	46fc9cf002e384fb199029c681efd7e8
+# Source1-md5:	e49046cd56398f9f9b8410154f1a0393
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
@@ -101,9 +99,11 @@ BuildRequires:	bash
 BuildRequires:	bcc
 BuildRequires:	bin86
 BuildRequires:	curl-devel
+BuildRequires:	device-mapper-devel
 %{?with_doc:BuildRequires:	docbook-dtd44-xml}
 BuildRequires:	gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:	gsoap-devel}
+BuildRequires:	kBuild >= 0.1.9998-2
 BuildRequires:	libIDL-devel
 BuildRequires:	libcap-static
 BuildRequires:	libdrm-devel
@@ -138,6 +138,7 @@ BuildRequires:	texlive-xetex
 BuildRequires:	which
 BuildRequires:	xalan-c-devel >= 1.10.0
 BuildRequires:	xerces-c-devel >= 2.6.0
+BuildRequires:	yasm
 BuildRequires:	zlib-devel >= 1.2.1
 %endif
 %if %{with dist_kernel}
@@ -148,6 +149,7 @@ Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires:	QtCore >= 4.7.0
+Requires:	desktop-file-utils
 Requires:	libvncserver >= 0.9.9
 Suggests:	gxmessage
 Provides:	group(vbox)
@@ -173,6 +175,15 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # which lead to 'Stripping ... ELF shared libraries... (...)/nls/qt_ro.qm: File format not recognized'
 %define		_noautostrip	.*%{_libdir}/%{name}/.*
 
+%define		vbox_kernel_post(d:)	\
+if [ -x /etc/rc.d/init.d/%{-d*} ]; then \
+	%{expand:%service %%{-d*} restart %%*} \
+else \
+	/sbin/rmmod %{-d*} || : \
+	/sbin/modprobe -s %{-d*} || : \
+fi \
+%{nil}
+
 %description
 Oracle VirtualBox is a general-purpose full virtualizer for x86
 hardware. Targeted at server, desktop and embedded use, it is now the
@@ -254,7 +265,7 @@ You should install this package in your Host OS.
 %package guest
 Summary:	VirtualBox Guest Additions
 Group:		Base
-Requires:	xorg-driver-input-vboxmouse = %{version}-%{release}
+Obsoletes:	xorg-driver-input-vboxmouse < %{version}-%{release}
 Requires:	xorg-driver-video-vboxvideo = %{version}-%{release}
 Suggests:	kernel%{_alt_kernel}-misc-vboxsf = %{version}-%{rel}@%{_kernel_ver_str}
 Suggests:	kernel%{_alt_kernel}-misc-vboxvideo = %{version}-%{rel}@%{_kernel_ver_str}
@@ -274,20 +285,6 @@ Group:		Base
 PAM module (Pluggable Authentication Module) which can be used to
 perform automated guest logons.
 
-%package -n xorg-driver-input-vboxmouse
-Summary:	X.org mouse driver for VirtualBox guest OS
-Summary(pl.UTF-8):	Sterownik myszy dla systemu gościa w VirtualBoksie
-Group:		X11/Applications
-Requires:	xorg-xserver-server >= 1.0.99.901
-Requires:	xorg-xserver-server(xinput-abi) <= 18.0
-Requires:	xorg-xserver-server(xinput-abi) >= 4.0
-
-%description -n xorg-driver-input-vboxmouse
-X.org mouse driver for VirtualBox guest OS.
-
-%description -n xorg-driver-input-vboxmouse  -l pl.UTF-8
-Sterownik myszy dla systemu gościa w VirtualBoksie.
-
 %package -n xorg-driver-video-vboxvideo
 Summary:	X.org video driver for VirtualBox guest OS
 Summary(pl.UTF-8):	Sterownik grafiki dla systemu gościa w VirtualBoksie
@@ -295,7 +292,7 @@ Group:		X11/Applications
 Requires:	Mesa-dri-driver-swrast
 Requires:	xorg-xserver-libdri >= 1.7.4
 Requires:	xorg-xserver-server >= 1.0.99.901
-Requires:	xorg-xserver-server(videodrv-abi) <= 13.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 13.1
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 
 %description -n xorg-driver-video-vboxvideo
@@ -514,7 +511,11 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
 
-sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
+# Respect LDFLAGS
+%{__sed} -i -e "s@_LDFLAGS\.%{vbox_arch}*.*=@& %{rpmldflags}@g" \
+	-i Config.kmk src/libs/xpcom18a4/Config.kmk
+
+%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
 
 install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
 cd PLD-MODULE-BUILD
@@ -527,6 +528,9 @@ cd -
 %patch10 -p1
 %patch11 -p1
 
+# using system kBuild package
+%{__rm} -r kBuild
+
 %build
 %if %{with userspace}
 echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk
@@ -542,12 +546,16 @@ echo "VBOX_WITH_TESTCASES := " > LocalConfig.kmk
 	%{nil}
 
 XSERVER_VERSION=$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel | awk -F. ' { print $1 $2 } ' 2> /dev/null || echo ERROR)
-. ./env.sh && \
-kmk -j1 \
+kmk %{?_smp_mflags} \
 	%{?with_verbose:KBUILD_VERBOSE=3} \
-	USER=$(id -un) \
+	USER=%(id -un) \
 	VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
-	XSERVER_VERSION="$XSERVER_VERSION"
+	XSERVER_VERSION="$XSERVER_VERSION" \
+	VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+	TOOL_GCC3_CFLAGS="%{rpmcflags}" \
+	TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
+	VBOX_GCC_OPT="%{rpmcxxflags}" \
+	%{nil}
 %endif
 
 %if %{with kernel}
@@ -578,7 +586,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{pname}/ExtensionP
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
 if cp -al VBox.png $RPM_BUILD_ROOT/Vbox.png 2>/dev/null; then
 	l=l
-	rm -f $RPM_BUILD_ROOT/VBox.png
+	%{__rm} -f $RPM_BUILD_ROOT/VBox.png
 fi
 
 cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
@@ -589,49 +597,45 @@ ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{
 %endif
 
 install -d $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
+cp -a$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
 install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/%{pname}
 for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do
 	ln -s %{_libdir}/%{pname}/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/VBox.png,%{_pixmapsdir}/virtualbox.png}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/VBox.png,%{_pixmapsdir}/virtualbox.png}
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
 
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/vboxmouse_drv.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
-# xorg other driver versions
-rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxmouse_drv*.{o,so}
-rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxvideo_drv*.{o,so}
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 
 # XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLcrutil.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLerrorspu.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLfeedbackspu.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
 
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 cp -a %{SOURCE11} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
 
 install -d $RPM_BUILD_ROOT/%{_lib}/security
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
 
 # cleanup unpackaged
-rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{src,sdk,testcase}
-rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{src,sdk,testcase}
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
 
 # Guest Only Tools
 install -d $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,xdg/autostart}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl
 install -p -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	$RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
 cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
@@ -639,26 +643,31 @@ cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
 
 # unknown - checkme
 %if 1
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.sh
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/load.sh
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/loadall.sh
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/CPUMInternal.d
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/cpumctx.d
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-arch-types.d
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-types.d
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vm.d
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/x86.d
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/testcase/%{vbox_arch}/vbox-vm-struct-test.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPLoggerCtl
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPUninstall
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/VBox.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/load.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/loadall.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/CPUMInternal.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/cpumctx.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-arch-types.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vbox-types.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/vm.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/lib/%{vbox_arch}/x86.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace/testcase/%{vbox_arch}/vbox-vm-struct-test.d
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/helpers/generate_service_file
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/VBoxHeadlessXOrg.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/init_template.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install_service
 %endif
 
 # packaged by kernel part
-rm $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
 %endif
 
 %if %{with kernel}
@@ -726,102 +735,116 @@ if [ "$1" = "0" ]; then
 	%groupremove vbox
 fi
 
-%post	-n kernel%{_alt_kernel}-misc-vboxguest
-%depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxguest
-%service vboxguest restart "VirtualBox Guest additions driver"
-%systemd_reload
-
-%postun	-n kernel%{_alt_kernel}-misc-vboxguest
-%depmod %{_kernel_ver}
-
-%preun -n kernel%{_alt_kernel}-misc-vboxguest
-if [ "$1" = "0" ]; then
-	%service vboxguest stop
-	/sbin/chkconfig --del vboxguest
-fi
-
 %post	-n kernel%{_alt_kernel}-misc-vboxdrv
 %depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxdrv
-%service vboxdrv restart "VirtualBox Support Driver"
-%systemd_reload
-
-%postun	-n kernel%{_alt_kernel}-misc-vboxdrv
-%depmod %{_kernel_ver}
+%vbox_kernel_post -d vboxdrv VirtualBox Support Driver
 
 %preun -n kernel%{_alt_kernel}-misc-vboxdrv
 if [ "$1" = "0" ]; then
 	%service vboxdrv stop
-	/sbin/chkconfig --del vboxdrv
 fi
 
-%post	-n kernel%{_alt_kernel}-misc-vboxnetadp
+%postun	-n kernel%{_alt_kernel}-misc-vboxdrv
 %depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxnetadp
-%service vboxnetadp restart "VirtualBox Network HostOnly driver"
-%systemd_reload
 
-%postun	-n kernel%{_alt_kernel}-misc-vboxnetadp
+%post	-n kernel%{_alt_kernel}-misc-vboxnetadp
 %depmod %{_kernel_ver}
+%vbox_kernel_post -d vboxnetadp VirtualBox Network HostOnly driver
 
 %preun -n kernel%{_alt_kernel}-misc-vboxnetadp
 if [ "$1" = "0" ]; then
 	%service vboxnetadp stop
-	/sbin/chkconfig --del vboxnetadp
 fi
 
-%post	-n kernel%{_alt_kernel}-misc-vboxnetflt
+%postun	-n kernel%{_alt_kernel}-misc-vboxnetadp
 %depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxnetflt
-%service vboxnetflt restart "VirtualBox Network Filter driver"
-%systemd_reload
 
-%postun	-n kernel%{_alt_kernel}-misc-vboxnetflt
+%post	-n kernel%{_alt_kernel}-misc-vboxnetflt
 %depmod %{_kernel_ver}
+%vbox_kernel_post -d vboxnetflt VirtualBox Network Filter driver
 
 %preun -n kernel%{_alt_kernel}-misc-vboxnetflt
 if [ "$1" = "0" ]; then
 	%service vboxnetflt stop
-	/sbin/chkconfig --del vboxnetflt
 fi
 
-%post	-n kernel%{_alt_kernel}-misc-vboxpci
+%postun	-n kernel%{_alt_kernel}-misc-vboxnetflt
 %depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxpci
-%service vboxnetflt restart "VirtualBox PCI passthrough driver"
-%systemd_reload
 
-%postun	-n kernel%{_alt_kernel}-misc-vboxpci
+%post	-n kernel%{_alt_kernel}-misc-vboxpci
 %depmod %{_kernel_ver}
+%vbox_kernel_post -d vboxpci VirtualBox PCI passthrough driver
 
 %preun -n kernel%{_alt_kernel}-misc-vboxpci
 if [ "$1" = "0" ]; then
 	%service vboxpci stop
-	/sbin/chkconfig --del vboxpci
 fi
 
-%post	-n kernel%{_alt_kernel}-misc-vboxsf
+%postun	-n kernel%{_alt_kernel}-misc-vboxpci
 %depmod %{_kernel_ver}
-/sbin/chkconfig --add vboxsf
-%service vboxsf restart "VirtualBox Host file system access (Shared Folders)"
-%systemd_reload
 
-%postun	-n kernel%{_alt_kernel}-misc-vboxsf
+%post	-n kernel%{_alt_kernel}-misc-vboxguest
 %depmod %{_kernel_ver}
+%vbox_kernel_post -d vboxguest VirtualBox Guest additions driver
+
+%preun -n kernel%{_alt_kernel}-misc-vboxguest
+if [ "$1" = "0" ]; then
+	%service vboxguest stop
+fi
+
+%postun	-n kernel%{_alt_kernel}-misc-vboxguest
+%depmod %{_kernel_ver}
+
+%post	-n kernel%{_alt_kernel}-misc-vboxsf
+%depmod %{_kernel_ver}
+%vbox_kernel_post -d vboxsf VirtualBox Host file system access (Shared Folders)
 
 %preun -n kernel%{_alt_kernel}-misc-vboxsf
 if [ "$1" = "0" ]; then
 	%service vboxsf stop
-	/sbin/chkconfig --del vboxsf
 fi
 
+%postun	-n kernel%{_alt_kernel}-misc-vboxsf
+%depmod %{_kernel_ver}
+
 %post	-n kernel%{_alt_kernel}-misc-vboxvideo
 %depmod %{_kernel_ver}
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxvideo
 %depmod %{_kernel_ver}
 
+%post kernel-init-host
+/sbin/chkconfig --add vboxdrv
+/sbin/chkconfig --add vboxnetadp
+/sbin/chkconfig --add vboxnetflt
+/sbin/chkconfig --add vboxpci
+%systemd_reload
+
+%preun kernel-init-host
+if [ "$1" = "0" ]; then
+	/sbin/chkconfig --del vboxdrv
+	/sbin/chkconfig --del vboxnetadp
+	/sbin/chkconfig --del vboxnetflt
+	/sbin/chkconfig --del vboxpci
+fi
+
+%postun kernel-init-host
+%systemd_reload
+
+%post kernel-init-guest
+/sbin/chkconfig --add vboxguest
+/sbin/chkconfig --add vboxsf
+%systemd_reload
+
+%preun kernel-init-guest
+if [ "$1" = "0" ]; then
+	/sbin/chkconfig --del vboxguest
+	/sbin/chkconfig --del vboxsf
+fi
+
+%postun kernel-init-guest
+%systemd_reload
+
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -963,10 +986,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd
 %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-service
 %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-x11
-# XXX these files belong to xorg-driver-video-vboxvideo
-# but probably 18-system-xorg.patch patch is broken?
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxvideo_drv_111.so
-%attr(755,root,root) %{_libdir}/%{pname}/additions/vboxvideo_drv_112.so
 
 %files -n pam-pam_vbox
 %defattr(644,root,root,755)
@@ -987,10 +1006,6 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
 
-%files -n xorg-driver-input-vboxmouse
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/input/vboxmouse_drv.so
-
 %files -n xorg-driver-video-vboxvideo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so