X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=813f170d03928b1db7d6b9de130dc3fdccc86d8d;hb=HEAD;hp=2ea779b487a7154b39763acb3fa93cb6a13d2603;hpb=90c4d2d1151296c2d01aa0cfce734f3f34461414;p=packages%2FVirtualBox.git

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2ea779b..3164020 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -21,6 +21,7 @@
 %bcond_without	dkms		# build dkms package
 %bcond_without	verbose
 %bcond_without	gui			# disable Qt4 GUI frontend build
+%bcond_without	host			# build guest packages only
 
 %if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
 %{error:kernel and userspace cannot be built at the same time on PLD builders}
@@ -40,6 +41,10 @@ exit 1
 %define		_enable_debug_packages	0
 %endif
 
+%ifnarch %{x8664} %{?with_kernel:x32}
+%undefine	with_host
+%endif
+
 %define		qtver	5.6.0
 
 %define		rel		1
@@ -47,14 +52,14 @@ exit 1
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	6.0.14
+Version:	7.0.18
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Applications/Emulators
-Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5:	2766d6f628dcd8f0bc216d0f8a2abc8e
-Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	b6992ff74c65b964ddfe1ce951467493
+Source0:	https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
+# Source0-md5:	b1259b71044ab24671d6f5757855548d
+Source1:	https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
+# Source1-md5:	c31a1845868d0913012f1dc481461e8f
 Source2:	vboxservice.init
 Source3:	vboxservice.service
 Source4:	vboxservice.sysconfig
@@ -69,21 +74,22 @@ Source12:	udev-guest.rules
 Patch0:		%{pname}-version-error.patch
 Patch1:		%{pname}-VBoxSysInfo.patch
 Patch2:		%{pname}-warning_workaround.patch
-Patch3:		%{pname}-dri.patch
 Patch4:		wrapper.patch
-Patch5:		xserver-1.12.patch
 Patch6:		hardening-shared.patch
 Patch7:		lightdm-greeter-makefile.patch
 Patch8:		lightdm-greeter-g++-link.patch
 Patch9:		pld-guest.patch
 Patch10:	16-no-update.patch
 Patch11:	%{pname}-all-translations.patch
-Patch12:	x32.patch
 Patch13:	%{pname}-no-scrextend.patch
-Patch14:	%{pname}-multipython.patch
 Patch15:	%{pname}-lightdm-1.19.2.patch
 Patch16:	%{pname}-no-vboxvideo.patch
 Patch17:	qt5-gl.patch
+Patch18:	qt-detect.patch
+Patch19:	python3.patch
+Patch20:	gcc-13.patch
+Patch21:	xsl-style-dir.patch
+Patch22:	build-arch.patch
 URL:		http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -112,6 +118,7 @@ BuildRequires:	OpenGL-devel
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= %{qtver}
+BuildRequires:	Qt5Help-devel >= %{qtver}
 BuildRequires:	Qt5Network-devel >= %{qtver}
 BuildRequires:	Qt5OpenGL-devel >= %{qtver}
 BuildRequires:	Qt5PrintSupport-devel >= %{qtver}
@@ -126,19 +133,24 @@ BuildRequires:	bcc
 BuildRequires:	bin86
 BuildRequires:	curl-devel >= 7.19.1
 BuildRequires:	device-mapper-devel >= 1.02
-%{?with_doc:BuildRequires:	docbook-dtd44-xml}
+%if %{with doc}
+BuildRequires:	docbook-dtd45-xml
+BuildRequires:	docbook-style-xsl
+%endif
 BuildRequires:	fakeroot
 %{?with_lightdm:BuildRequires:	fltk-devel}
 BuildRequires:	gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:	gsoap-devel}
 BuildRequires:	issue
-BuildRequires:	kBuild >= 0.1.9998.3093
+BuildRequires:	kBuild >= 0.1.9998.3598
 BuildRequires:	libIDL-devel
 BuildRequires:	libcap-static
 BuildRequires:	libdrm-devel
-BuildRequires:	libpng-devel >= 1.2.5
+BuildRequires:	liblzf-devel
+BuildRequires:	libpng-devel >= 2:1.2.5
 BuildRequires:	libstdc++-devel >= 5:3.2.3
 BuildRequires:	libstdc++-static >= 5:3.2.3
+BuildRequires:	libtpms-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	libvncserver-devel >= 0.9.9
 BuildRequires:	libvpx-devel >= 0.9.5
@@ -153,11 +165,12 @@ BuildRequires:	pam-devel
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel >= 0.9.0
-BuildRequires:	python-devel >= 2.3
-BuildRequires:	python-modules
+BuildRequires:	python3-devel >= 1:3.6
+BuildRequires:	python3-modules
+BuildRequires:	qt5-assistant
 BuildRequires:	qt5-build
 BuildRequires:	qt5-linguist
-BuildRequires:	rpmbuild(macros) >= 1.715
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 %if %{with doc}
 BuildRequires:	texlive-fonts-bitstream
@@ -196,6 +209,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		filterout		-Werror=format-security
 
+%define		_noautochrpath	.*\\.debug$
+
 %description
 Oracle VirtualBox is a general-purpose full virtualizer for x86
 hardware. Targeted at server, desktop and embedded use, it is now the
@@ -273,9 +288,7 @@ This package contains VirtualBox User Manual.
 Summary:	VirtualBox Guest Additions
 Group:		Base
 Requires:	%{name} = %{version}
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description additions
 VirtualBox Guest Additions.
@@ -311,9 +324,9 @@ Summary:	VirtualBox Guest X11 Additions
 Group:		X11/Applications
 Requires:	%{name}-guest = %{version}-%{release}
 Requires:	xorg-app-xrandr
-Requires:	xorg-driver-video-vboxvideo = %{version}-%{release}
 Requires:	kernel(vboxvideo)
 Obsoletes:	xorg-driver-input-vboxmouse < %{version}-%{release}
+Obsoletes:	xorg-driver-video-vboxvideo < %{version}-%{release}
 
 %description guest-x11
 Tools for X11 session that utilize kernel modules for supporting
@@ -354,34 +367,13 @@ Group:		Base
 PAM module (Pluggable Authentication Module) which can be used to
 perform automated guest logons.
 
-%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
-Group:		X11/Applications
-Requires:	Mesa-dri-driver-swrast
-Requires:	xorg-driver-video-modesetting
-Requires:	xorg-xserver-libdri >= 1.7.4
-Requires:	xorg-xserver-server >= 1.0.99.901
-%{?requires_xorg_xserver_videodrv}
-Provides:	OpenGL = 2.1
-Provides:	OpenGL-GLX = 1.3
-Provides:	xorg-xserver-module(glx)
-
-%description -n xorg-driver-video-vboxvideo
-X.org video driver for VirtualBox guest OS.
-
-%description -n xorg-driver-video-vboxvideo -l pl.UTF-8
-Sterownik grafiki dla systemu gościa w VirtualBoksie.
-
 %package -n dkms-vboxguest
 Summary:	VirtualBox kernel modules source for Linux Guest
 Summary(pl.UTF-8):	Moduły VirtualBoksa do jądra Linuksa dla systemu gościa
 License:	GPL v2+
 Group:		Base/Kernel
 Requires:	dkms
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n dkms-vboxguest
 This package contains DKMS-ready VirtualBox Guest Additions for Linux
@@ -399,9 +391,7 @@ Summary(pl.UTF-8):	Moduły jądra Linuksa dla VirtualBoksa
 License:	GPL v2+
 Group:		Base/Kernel
 Requires:	dkms
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n dkms-vboxhost
 This package contains DKMS enabled sourcecode of VirtualBox Support
@@ -434,7 +424,9 @@ Requires:	%{releq_kernel -n drm}\
 Requires(postun):	%releq_kernel\
 Provides:	kernel(vboxguest) = %{version}-%{rel}\
 Provides:	kernel(vboxsf) = %{version}-%{rel}\
+%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
 Provides:	kernel(vboxvideo) = %{version}-%{rel}\
+%endif\
 Obsoletes:	kernel-init-guest\
 Conflicts:	kernel%{_alt_kernel}-virtualbox-host\
 \
@@ -462,7 +454,6 @@ Requires:	systemd-units >= 38\
 Provides:	kernel(vboxdrv) = %{version}-%{rel}\
 Provides:	kernel(vboxnetadp) = %{version}-%{rel}\
 Provides:	kernel(vboxnetflt) = %{version}-%{rel}\
-Provides:	kernel(vboxpci) = %{version}-%{rel}\
 Obsoletes:	kernel-init-host\
 \
 %description -n kernel%{_alt_kernel}-virtualbox-host\
@@ -483,18 +474,21 @@ gospodarzem sprzętu PCI.\
 %config(noreplace) %verify(not md5 mtime size) /etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
 %endif\
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 14 0}\
 /lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\
 /lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\
 %if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
 /lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*\
 %endif\
+%endif\
 \
+%if %{with host}\
 %files -n kernel%{_alt_kernel}-virtualbox-host\
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-host.conf\
 /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*\
 /lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*\
 /lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*\
-/lib/modules/%{_kernel_ver}/misc/vboxpci.ko*\
+%endif\
 %endif\
 \
 %post -n kernel%{_alt_kernel}-virtualbox-guest\
@@ -503,39 +497,45 @@ gospodarzem sprzętu PCI.\
 %postun	-n kernel%{_alt_kernel}-virtualbox-guest\
 %depmod %{_kernel_ver}\
 \
+%if %{with host}\
 %post	-n kernel%{_alt_kernel}-virtualbox-host\
 %depmod %{_kernel_ver}\
 \
 %postun	-n kernel%{_alt_kernel}-virtualbox-host\
 %depmod %{_kernel_ver}\
+%endif\
 %{nil}
 
 %define build_kernel_pkg()\
 export KERN_DIR=%{_kernelsrcdir}\
-cd PLD-MODULE-BUILD/HostDrivers\
+%if %{with host}\
+cd kernel/HostDrivers\
 %build_kernel_modules -m vboxdrv -C vboxdrv\
 %build_kernel_modules -m vboxnetadp -C vboxnetadp KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
 %build_kernel_modules -m vboxnetflt -C vboxnetflt KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
-%build_kernel_modules -m vboxpci -C vboxpci KBUILD_EXTRA_SYMBOLS=$PWD/../vboxdrv/Module.symvers\
-cd ../GuestDrivers\
+%install_kernel_modules -D ../../kernel/installed -m vboxdrv/vboxdrv,vboxnetadp/vboxnetadp,vboxnetflt/vboxnetflt -d misc\
+cd ../..\
+%endif\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 14 0}\
+cd kernel/GuestDrivers\
 %build_kernel_modules -m vboxguest -C vboxguest\
-cp -a vboxguest/Module.symvers vboxsf\
-%build_kernel_modules -m vboxsf -C vboxsf -c\
+%build_kernel_modules -m vboxsf -C vboxsf KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxsf/vboxsf,vboxguest/vboxguest -d misc\
 %if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
-%build_kernel_modules -m vboxvideo -C vboxvideo\
+%build_kernel_modules -m vboxvideo -C vboxvideo KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
+%install_kernel_modules -D ../../kernel/installed -m vboxvideo/vboxvideo -d misc\
 %endif\
 cd ../..\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv,PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp,PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt,PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc\
-%if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
 %endif\
 %{nil}
 
 %define install_kernel_pkg()\
 %if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\
-install -d PLD-MODULE-BUILD/installed/etc/depmod.d/%{_kernel_ver}\
-echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+install -d kernel/installed/etc/depmod.d/%{_kernel_ver}\
+echo override vboxguest %{_kernel_ver} misc > kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%if %{_kernel_version_code} >= %{_kernel_version_magic 5 6 0}\
+echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
+%endif\
 %endif\
 %{nil}
 
@@ -546,9 +546,7 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -557,12 +555,15 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep
 %if %{with all_langs}
 %patch11 -p0
 %endif
-%patch12 -p1
 %patch13 -p1
-%patch14 -p0
 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -574,8 +575,8 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep
 %{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' src/VBox/Installer/linux/VBox.sh
 
 %if %{with kernel}
-install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
-cd PLD-MODULE-BUILD
+install -d kernel/{GuestDrivers,HostDrivers}
+cd kernel
 ../src/VBox/Additions/linux/export_modules.sh guest-modules.tar.gz
 tar -zxf guest-modules.tar.gz -C GuestDrivers
 
@@ -612,6 +613,11 @@ TOOL_GCC3_CFLAGS=%{rpmcflags}
 TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
 VBOX_GCC_OPT=%{rpmcxxflags}
 
+TOOL_YASM_AS := /usr/bin/yasm
+
+VBOX_BLD_PYTHON := %{__python3}
+VBOX_WITHOUT_PYTHON_LIMITED_API=1
+
 VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname}
 VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname}
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
@@ -626,6 +632,10 @@ VBOX_WITH_TESTSUITE :=
 
 VBOX_WITH_VRDP_RDESKTOP=
 VBOX_WITH_MULTIVERSION_PYTHON=0
+%if %{without host}
+VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1
+VBOX_ONLY_ADDITIONS=1
+%endif
 EOF
 
 %undefine	filterout_c
@@ -643,10 +653,11 @@ EOF
 	--enable-vnc \
 	%{!?with_gui:--disable-qt} \
 	%{__enable webservice} \
+	%{!?with_host:--only-additions} \
 	%{nil}
 
 . "$PWD/env.sh"
-kmk %{?_smp_mflags}
+kmk %{?_smp_mflags} %{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1 VBOX_ONLY_ADDITIONS=1}
 %endif
 
 %{?with_kernel:%{expand:%build_kernel_packages}}
@@ -673,22 +684,17 @@ fi
 install -d $RPM_BUILD_ROOT%{_datadir}/%{pname}
 
 cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
-cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso ||
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
 
 %if %{without gui}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml
 %endif
 
-# vboxvideo
-%{__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}}/VBoxEGL.so
-
 # Guest Only Tools
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxAudioTest
 %{__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}}/VBoxDRMClient
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService
 install -d $RPM_BUILD_ROOT/etc/xdg/autostart
 cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
@@ -728,6 +734,9 @@ install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
 
+cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxguest.rules
+
+%if %{with host}
 # unknown - checkme
 %if 1
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall
@@ -739,10 +748,12 @@ install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
 %endif
 
+cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso ||
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
+
 # manual installation steps based on src/VBox/Installer/linux/install.sh
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VirtualBox
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
 ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
@@ -779,7 +790,6 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
 
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules
-cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxguest.rules
 
 %if %{with dkms}
 mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
@@ -789,7 +799,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{v
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/{sdk,testcase}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/dtrace
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxkeyboard.tar.bz2
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/tst*
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/generated.sh
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack-license.*
 
@@ -808,11 +817,12 @@ ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{
 %endif
 %endif
 %endif
+%endif
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT{/etc/modules-load.d,/sbin}
 
-cp -a PLD-MODULE-BUILD/installed/* $RPM_BUILD_ROOT
+cp -a kernel/installed/* $RPM_BUILD_ROOT
 
 # Tell systemd to load modules
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/modules-load.d/virtualbox-host.conf
@@ -918,6 +928,7 @@ dkms install -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade || :
 dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %if %{with userspace}
+%if %{with host}
 %files
 %defattr(644,root,root,755)
 %dir %attr(751,root,root) %{_sysconfdir}/vbox
@@ -930,7 +941,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_bindir}/VBoxDTrace
 %attr(755,root,root) %{_bindir}/VBoxHeadless
 %attr(755,root,root) %{_bindir}/VBoxManage
-%attr(755,root,root) %{_bindir}/VBoxSDL
 %attr(755,root,root) %{_bindir}/VBoxVRDP
 %attr(755,root,root) %{_bindir}/vbox-img
 %dir %{_libdir}/%{pname}
@@ -941,18 +951,16 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDDU.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxDxVk.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDragAndDropSvc.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxGlobal.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxPython*.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxREM.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSVGA3D.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedClipboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so
@@ -964,6 +972,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 # binaries
 %attr(755,root,root) %{_libdir}/%{pname}/VBox.sh
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxAudioTest
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDTrace
@@ -973,26 +982,28 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD
 %attr(755,root,root) %{_libdir}/%{pname}/VirtualBoxVM
 %attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports
 %attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
-%if %{with doc}
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
-%endif
+%attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount
 %dir %{_libdir}/%{pname}/tools
+%attr(755,root,root) %{_libdir}/%{pname}/tools/LnxPerfHack
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiSigDb
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFtpServer
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttpServer
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTIsoMaker
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTKrnlModInfo
 %attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrCheckImports
@@ -1023,14 +1034,10 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %{_libdir}/%{pname}/VBoxBugReport
 %{_libdir}/%{pname}/VBoxCpuReport
-%{_libdir}/%{pname}/VBoxDDRC.debug
-%{_libdir}/%{pname}/VBoxDDRC.rc
 %{_libdir}/%{pname}/VBoxDDR0.debug
 %{_libdir}/%{pname}/VBoxDDR0.r0
 %{_libdir}/%{pname}/VBoxEFI32.fd
 %{_libdir}/%{pname}/VBoxEFI64.fd
-%{_libdir}/%{pname}/VMMRC.debug
-%{_libdir}/%{pname}/VMMRC.rc
 %{_libdir}/%{pname}/VMMR0.debug
 %{_libdir}/%{pname}/VMMR0.r0
 
@@ -1053,6 +1060,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %files gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/VirtualBox
+%attr(755,root,root) %{_libdir}/%{pname}/UICommon.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
 %attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
@@ -1072,10 +1080,12 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm
 %lang(gl) %{_datadir}/%{pname}/nls/*_gl.qm
 %lang(he) %{_datadir}/%{pname}/nls/*_he.qm
+%lang(hr) %{_datadir}/%{pname}/nls/*_hr_HR.qm
 %lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm
 %lang(id) %{_datadir}/%{pname}/nls/*_id.qm
 %lang(it) %{_datadir}/%{pname}/nls/*_it.qm
 %lang(ja) %{_datadir}/%{pname}/nls/*_ja.qm
+%lang(ka) %{_datadir}/%{pname}/nls/*_ka.qm
 %lang(km_KH) %{_datadir}/%{pname}/nls/*_km_KH.qm
 %lang(ko) %{_datadir}/%{pname}/nls/*_ko.qm
 %lang(lt) %{_datadir}/%{pname}/nls/*_lt.qm
@@ -1106,6 +1116,32 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %defattr(644,root,root,755)
 %{_datadir}/%{pname}/VBoxGuestAdditions.iso
 
+%if %{with webservice}
+%files webservice
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vboxwebsrv
+%attr(755,root,root) %{_libdir}/%{pname}/vboxwebsrv
+%attr(755,root,root) %{_libdir}/%{pname}/webtest
+%endif
+
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc %{_libdir}/%{pname}/UserManual.qch
+%doc %{_libdir}/%{pname}/UserManual.qhc
+# this is a symlink...
+%doc %{_libdir}/%{pname}/UserManual.pdf
+%if %{with all_langs}
+%lang(fr) %doc %{_libdir}/%{pname}/UserManual_fr_FR.pdf
+%endif
+# ..to this file
+%doc %{outdir}/UserManual.pdf
+%if %{with all_langs}
+%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
+%endif
+%endif
+%endif
+
 %files guest
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/mount.vboxsf
@@ -1113,6 +1149,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vboxservice
 %{systemdunitdir}/vboxservice.service
 %{systemdunitdir}/vboxclient-vmsvga.service
+%attr(755,root,root) %{_bindir}/VBoxAudioTest
 %attr(755,root,root) %{_bindir}/VBoxControl
 %attr(755,root,root) %{_bindir}/VBoxService
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxguest.rules
@@ -1122,14 +1159,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 /etc/xdg/autostart/vboxclient.desktop
 %attr(755,root,root) %{_bindir}/VBoxClient
 %attr(755,root,root) %{_bindir}/VBoxClient-all
-
-%if %{with webservice}
-%files webservice
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vboxwebsrv
-%attr(755,root,root) %{_libdir}/%{pname}/vboxwebsrv
-%attr(755,root,root) %{_libdir}/%{pname}/webtest
-%endif
+%attr(755,root,root) %{_bindir}/VBoxDRMClient
 
 %if %{with lightdm}
 %files -n lightdm-greeter-vbox
@@ -1142,34 +1172,15 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/security/pam_vbox.so
 
-%if %{with doc}
-%files doc
-%defattr(644,root,root,755)
-# this is a symlink...
-%doc %{_libdir}/%{pname}/UserManual.pdf
-%if %{with all_langs}
-%lang(fr) %doc %{_libdir}/%{pname}/UserManual_fr_FR.pdf
-%endif
-# ..to this file
-%doc %{outdir}/UserManual.pdf
-%if %{with all_langs}
-%lang(fr) %doc %{outdir}/UserManual_fr_FR.pdf
-%endif
-%endif
-
-%files -n xorg-driver-video-vboxvideo
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so
-# vboxvideo_dri.so deps
-%attr(755,root,root) %{_libdir}/VBoxEGL.so
-
 %if %{with dkms}
 %files -n dkms-vboxguest
 %defattr(644,root,root,755)
 %{_usrsrc}/vboxguest-%{version}-%{rel}
 
+%if %{with host}
 %files -n dkms-vboxhost
 %defattr(644,root,root,755)
 %{_usrsrc}/vboxhost-%{version}-%{rel}
 %endif
 %endif
+%endif