X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=VirtualBox.spec;h=05c1f72ce826f3c7b67bf70a08700d8e908a7985;hp=a2b365968521a05336e33c50b22f3cfc3079c605;hb=640931aa733234d86a37dac4a7cdc296a25fbc1b;hpb=632ec0b7d8120e472875d0ac5d369748eae052bc

diff --git a/VirtualBox.spec b/VirtualBox.spec
index a2b3659..05c1f72 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,3 +1,5 @@
+# NOTE
+# - https://www.virtualbox.org/wiki/Linux%20build%20instructions
 # TODO
 # - java bindings
 # - Package SDK.
@@ -9,112 +11,112 @@
 # - fix desc for dkms packages (proper wording needed), kernel modules desc is mess as well
 #
 # Conditional build:
+%bcond_with	all_langs	# build with all manual translations
 %bcond_without	doc		# don't build the documentation
-%bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	debuginfo		# disable debuginfo creation (to save space when compiling)
 %bcond_without	kernel		# don't build kernel module
 %bcond_without	userspace	# don't build userspace package
 %bcond_with	webservice	# webservice (SOAP) support
 %bcond_without	lightdm		# lightdm greeter
 %bcond_without	dkms		# build dkms package
 %bcond_without	verbose
+%bcond_without	gui			# disable Qt4 GUI frontend build
 
-%if %{without kernel}
-%undefine	with_dist_kernel
-%else
-%define		_duplicate_files_terminate_build	0
-%endif
-
-# The goal here is to have main, userspace, package built once with
-# simple release number, and only rebuild kernel packages with kernel
-# version as part of release number, without the need to bump release
-# with every kernel change.
 %if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
 %{error:kernel and userspace cannot be built at the same time on PLD builders}
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine	with_userspace
-%global		_build_kernels		%{alt_kernel}
-%else
-%global		_build_kernels		%{?build_kernels:,%{?build_kernels}}
+%if %{with kernel}
+%define		_duplicate_files_terminate_build	0
 %endif
 
 %if %{without userspace}
 # nothing to be placed to debuginfo package
+%undefine	with_debuginfo
+%endif
+
+%if %{without debuginfo}
 %define		_enable_debug_packages	0
 %endif
 
-%define		kbrs	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
-%define		kpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define		bkpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-%define		ikpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
+%define		qtver	4.8.0
 
-%define		rel		3
+%define		rel		1
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	4.3.8
+Version:	5.0.12
 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:	422ab09b7eb9c0564b55a6a0a6e6678f
+# Source0-md5:	5912835882ef547e0559c7e73bc85828
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5:	f23d3980a509418b2dcb614483271ffa
+# Source1-md5:	2a48dcce3f53618d078d473bc91cead3
 Source2:	vboxservice.init
 Source3:	vboxservice.service
-Source4:	%{pname}.sh
 Source5:	mount.vdi
 Source6:	udev.rules
 Source7:	%{pname}-virtualbox-host-modules-load.conf
 Source8:	%{pname}-virtualbox-guest-modules-load.conf
-Patch0:		%{pname}-configure-spaces.patch
+Source9:	vboxautostart.init
+Source10:	autostart.cfg
+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-glib-includes.patch
 Patch8:		lightdm-greeter-g++-link.patch
 Patch9:		pld-guest.patch
 Patch10:	16-no-update.patch
 Patch11:	18-system-xorg.patch
+Patch12:	%{pname}-all-translations.patch
+Patch13:	x32.patch
+Patch14:	%{pname}-no-scrextend.patch
 URL:		http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
-BuildRequires:	gcc-multilib
+BuildRequires:	gcc-multilib-32
 BuildRequires:	glibc-devel(i686)
-BuildRequires:	libstdc++-multilib-devel
-BuildRequires:	libstdc++-multilib-static
+BuildRequires:	libstdc++-multilib-32-devel
+BuildRequires:	libstdc++-multilib-32-static
 %endif
 %if "%{pld_release}" == "ac"
 BuildRequires:	XFree86-devel
 %else
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXcomposite-devel
 BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXdamage-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-proto-glproto-devel
 BuildRequires:	xorg-xserver-server-devel
 %endif
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
-BuildRequires:	QtGui-devel
-BuildRequires:	QtNetwork-devel
-BuildRequires:	QtOpenGL-devel
+BuildRequires:	QtCore-devel >= %{qtver}
+BuildRequires:	QtGui-devel >= %{qtver}
+BuildRequires:	QtNetwork-devel >= %{qtver}
+BuildRequires:	QtOpenGL-devel >= %{qtver}
+BuildRequires:	QtXml-devel >= %{qtver}
 BuildRequires:	SDL-devel >= 1.2.7
 BuildRequires:	acpica
 BuildRequires:	alsa-lib-devel >= 1.0.6
 BuildRequires:	bash
 BuildRequires:	bcc
 BuildRequires:	bin86
-BuildRequires:	curl-devel
-BuildRequires:	device-mapper-devel
+BuildRequires:	curl-devel >= 7.19.1
+BuildRequires:	device-mapper-devel >= 1.02
 %{?with_doc:BuildRequires:	docbook-dtd44-xml}
+BuildRequires:	fakeroot
 %{?with_lightdm:BuildRequires:	fltk-devel}
 BuildRequires:	gcc >= 5:3.2.3
 %{?with_webservice:BuildRequires:	gsoap-devel}
@@ -128,22 +130,23 @@ BuildRequires:	libstdc++-devel >= 5:3.2.3
 BuildRequires:	libstdc++-static >= 5:3.2.3
 BuildRequires:	libuuid-devel
 BuildRequires:	libvncserver-devel >= 0.9.9
-BuildRequires:	libvpx-devel
+BuildRequires:	libvpx-devel >= 0.9.5
 BuildRequires:	libxml2-devel >= 2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 BuildRequires:	libxslt-progs >= 1.1.17
-%{?with_lightdm:BuildRequires:	lightdm-libs-qt-devel}
+%{?with_lightdm:BuildRequires:	lightdm-libs-qt4-devel}
 BuildRequires:	makeself
 BuildRequires:	mkisofs
+BuildRequires:	openssl-devel >= 0.9.8
 BuildRequires:	pam-devel
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel >= 0.9.0
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 2.3
 BuildRequires:	python-modules
-BuildRequires:	qt4-build >= 4.2.0
+BuildRequires:	qt4-build
 BuildRequires:	qt4-linguist
-BuildRequires:	rpmbuild(macros) >= 1.678
+BuildRequires:	rpmbuild(macros) >= 1.701
 BuildRequires:	sed >= 4.0
 %if %{with doc}
 BuildRequires:	texlive-fonts-bitstream
@@ -156,10 +159,10 @@ BuildRequires:	texlive-xetex
 BuildRequires:	which
 BuildRequires:	xalan-c-devel >= 1.10.0
 BuildRequires:	xerces-c-devel >= 2.6.0
-BuildRequires:	yasm
+BuildRequires:	yasm >= 0.5.1
 BuildRequires:	zlib-devel >= 1.2.1
 %endif
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
@@ -168,7 +171,7 @@ Requires:	libvncserver >= 0.9.9
 Requires:	udev-core
 Provides:	group(vbox)
 Obsoletes:	VirtualBox-udev < 4.2.10-5
-ExclusiveArch:	%{ix86} %{x8664}
+ExclusiveArch:	%{ix86} %{x8664} %{?with_kernel:x32}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch %{x8664}
@@ -229,11 +232,13 @@ konfigurację maszyny wirtualnej na inny komputer.
 Summary:	Qt GUI part for VirtualBox
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
-Requires:	QtCore >= 4.7.0
+Requires:	QtCore >= %{qtver}
 Requires:	desktop-file-utils
 Requires:	desktop-file-utils
 Requires:	fontconfig
 Requires:	fonts-Type1-urw
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 Requires:	shared-mime-info
 Suggests:	gxmessage
 Conflicts:	%{name} < 4.3.8-3
@@ -252,6 +257,9 @@ 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.
@@ -263,8 +271,12 @@ You should install this package in your Host OS.
 %package guest
 Summary:	VirtualBox Guest tools
 Group:		Base
-Requires(post,preun):	/sbin/chkconfig
+Provides:	group(vboxsf)
 Requires(post):	systemd-units >= 38
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
 Requires:	rc-scripts
 Requires:	systemd-units >= 38
 Suggests:	kernel(vboxguest)
@@ -279,9 +291,10 @@ You should install this package in your Guest OS for base VirtualBox
 communication
 
 %package guest-x11
-Summary:	VirtualBox Guest Additions
-Group:		Base
+Summary:	VirtualBox Guest X11 Additions
+Group:		X11/Applications
 Requires:	%{name}-guest = %{version}-%{release}
+Requires:	xorg-app-xrandr
 Requires:	xorg-driver-video-vboxvideo = %{version}-%{release}
 Suggests:	kernel(vboxvideo)
 Obsoletes:	xorg-driver-input-vboxmouse < %{version}-%{release}
@@ -308,8 +321,10 @@ Group:		Themes
 # NOTE: '#' in url is lost because rpm treats it as comment, even hacking with
 # macros doesn't help as rpmbuild takes final result to parse
 URL:		http://www.virtualbox.org/manual/ch09.html#autologon_unix_lightdm
+Requires:	%{name} = %{version}-%{release}
 Requires:	kernel(vboxguest)
 Requires:	lightdm >= 1.0.1
+Requires:	pam-pam_vbox = %{version}-%{release}
 Provides:	lightdm-greeter
 
 %description -n lightdm-greeter-vbox
@@ -330,9 +345,11 @@ 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) <= 15.0
-Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
+%{?requires_xorg_xserver_videodrv}
+Provides:	OpenGL = 2.1
+Provides:	OpenGL-GLX = 1.3
 Provides:	xorg-driver-video
+Provides:	xorg-xserver-module(glx)
 
 %description -n xorg-driver-video-vboxvideo
 X.org video driver for VirtualBox guest OS.
@@ -345,8 +362,7 @@ 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(pre):	dkms
-Requires(post):	dkms
+Requires:	dkms
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
@@ -366,8 +382,7 @@ Summary:	VirtualBox Support Drivers source
 Summary(pl.UTF-8):	Moduły jądra Linuksa dla VirtualBoksa
 License:	GPL v2+
 Group:		Base/Kernel
-Requires(pre):	dkms
-Requires(post):	dkms
+Requires:	dkms
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
@@ -398,11 +413,9 @@ Requires(post,postun):	/sbin/depmod\
 Requires(post):	systemd-units >= 38\
 Requires:	dev >= 2.9.0-7\
 Requires:	systemd-units >= 38\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires:	%{releq_kernel -n drm}\
 Requires(postun):	%releq_kernel\
-%endif\
 Provides:	kernel(vboxguest) = %{version}-%{rel}\
 Provides:	kernel(vboxsf) = %{version}-%{rel}\
 Provides:	kernel(vboxvideo) = %{version}-%{rel}\
@@ -427,10 +440,8 @@ Group:		Base/Kernel\
 Requires(post,postun):	/sbin/depmod\
 Requires(post):	systemd-units >= 38\
 Requires:	dev >= 2.9.0-7\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):	%releq_kernel\
-%endif\
 Requires:	systemd-units >= 38\
 Provides:	kernel(vboxdrv) = %{version}-%{rel}\
 Provides:	kernel(vboxnetadp) = %{version}-%{rel}\
@@ -491,16 +502,10 @@ cp -a vboxguest/Module.symvers vboxsf\
 %build_kernel_modules -m vboxsf -C vboxsf -c\
 %build_kernel_modules -m vboxvideo -C vboxvideo\
 cd ../..\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc\
-%install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
+%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/vboxguest/vboxguest,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf,PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -508,10 +513,19 @@ cd ../..\
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%if %{with all_langs}
+%patch12 -p0
+%endif
+%patch13 -p1
+%patch14 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -520,8 +534,9 @@ cd ../..\
 %{__sed} -i -e "s@_LDFLAGS\.%{vbox_arch}*.*=@& %{rpmldflags}@g" \
 	-i Config.kmk src/libs/xpcom18a4/Config.kmk
 
-%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE4} > VirtualBox-wrapper.sh
+%{__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
 ../src/VBox/Additions/linux/export_modules guest-modules.tar.gz
@@ -530,8 +545,7 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers
 ../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening
 tar -zxf host-modules.tar.gz -C HostDrivers
 cd -
-%patch10 -p1
-%patch11 -p1
+%endif
 
 # using system kBuild package
 %{__rm} -r kBuild
@@ -540,6 +554,11 @@ cd -
 cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}.png
 cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}_64.png
 
+# don't force whole userspace to be built with -fPIC
+# see https://www.virtualbox.org/pipermail/vbox-dev/2015-February/012863.html
+%define		filterout_c		-fPIC
+%define		filterout_cxx		-fPIC
+
 cat <<'EOF'>> LocalConfig.kmk
 %{?with_verbose:KBUILD_VERBOSE=3}
 USERNAME=%(id -un)
@@ -554,9 +573,25 @@ VBOX_WITH_LIGHTDM_GREETER_PACKING=1
 TOOL_GCC3_CFLAGS=%{rpmcflags}
 TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
 VBOX_GCC_OPT=%{rpmcxxflags}
-VBOX_WITH_TESTCASES=
+
+VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname}
+VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname}
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_ORIGIN :=
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+#VBOX_PATH_APP_DOCS := %{_docdir}/%{pname}-doc-%{version}
+VBOX_PATH_DOCBOOK_DTD := %{_datadir}/sgml/docbook/xml-dtd-4.4
+
+# don't build testcases to save time, they are not needed for the package
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+
+VBOX_WITH_VRDP_RDESKTOP=
 EOF
 
+%undefine	filterout_c
+%undefine	filterout_cxx
+
 %build
 %if %{with userspace}
 ./configure \
@@ -567,15 +602,15 @@ EOF
 	--disable-hardening \
 	--disable-kmods \
 	--enable-vnc \
+	%{!?with_gui:--disable-qt} \
 	%{__enable webservice} \
 	%{nil}
 
+. "$PWD/env.sh"
 kmk %{?_smp_mflags}
-
-%{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/{mount.vboxsf.c,vbsfmount.c} -o mount.vboxsf
 %endif
 
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -583,41 +618,29 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{%{_bindir},/sbin,%{_sbindir},%{_libdir}/%{pname}/ExtensionPacks} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_datadir}/mime/packages} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/vbox/autostart \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,dri,input} \
 	$RPM_BUILD_ROOT{/lib/udev,/etc/udev/rules.d} \
-	$RPM_BUILD_ROOT{/etc/rc.d/init.d,%{systemdunitdir}}
+	$RPM_BUILD_ROOT{/etc/rc.d/init.d,%{systemdunitdir},%{_usrsrc}}
 
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
 if cp -al COPYING $RPM_BUILD_ROOT/COPYING; then
 	l=l
-	%{__rm} -f $RPM_BUILD_ROOT/COPYING
+	%{__rm} $RPM_BUILD_ROOT/COPYING
 fi
 
 cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
+cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso ||
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
 
-%if %{with doc}
-ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf
-ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual_fr_FR.pdf
+%if %{without gui}
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml
 %endif
 
-install -d $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions
-cp -a$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
-install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/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
-
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxservice
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
-
-%{__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},%{_datadir}/mime/packages}/virtualbox.xml
-
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+# vboxvideo
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
-
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv_system.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.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
@@ -626,28 +649,20 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpackspu.so
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLpassthroughspu.so
 
-cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
-
-install -d $RPM_BUILD_ROOT/%{_lib}/security
-%{__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.*
-
 # 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
-install -p -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-	$RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+%{__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 \
 	$RPM_BUILD_ROOT/etc/xdg/autostart/vboxclient.desktop
+install -p src/VBox/Additions/x11/Installer/98vboxadd-xclient $RPM_BUILD_ROOT%{_bindir}/VBoxClient-all
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxservice
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/vboxservice.service
+
+install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart
+%{__sed} -i -e 's#@INSTALL_DIR@#%{_libdir}/%{pname}#' $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxautostart
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/vbox
 
 %if %{with lightdm}
 install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters
@@ -655,46 +670,91 @@ install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters
 cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters
 %endif
 
+%if %{with dkms}
+mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/src $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel}
+%endif
+
+# pam
+install -d $RPM_BUILD_ROOT/%{_lib}/security
+%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,/%{_lib}/security}/pam_vbox.so
+
+# mount.vboxsf
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
+
+# mount.vdi
+install -p %{SOURCE5} $RPM_BUILD_ROOT/sbin/mount.vdi
+
+# these belong to .iso
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/autorun.sh
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/runasroot.sh
+
+# scripts to setup modules, x11 and service. we have covered that in our packages
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-service
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxadd-x11
+
 # unknown - checkme
 %if 1
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/helpers/generate_service_file
 %{__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
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxshell.py
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/xpidl
 %endif
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/mount.vboxsf
+# use upstream installer to relocate rest of the files, fakeroot because it forces uid/gid 0
+fakeroot sh -x $RPM_BUILD_ROOT%{_libdir}/%{pname}/scripts/install.sh \
+	--ose \
+	--prefix %{_prefix} \
+	%{!?with_webservice:--no-web-service} \
+	%{!?with_gui:--no-qt} \
+	--root $RPM_BUILD_ROOT
 
-install -p mount.vboxsf $RPM_BUILD_ROOT/sbin/mount.vboxsf
+%{__mv} $RPM_BUILD_ROOT{%{_datadir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules
 
 %if %{with dkms}
-install -d $RPM_BUILD_ROOT%{_usrsrc}/vbox{host,guest}-%{version}-%{rel}
-cp -a PLD-MODULE-BUILD/HostDrivers/* $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
-cp -p src/VBox/HostDrivers/linux/dkms.conf $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
-%{__make} -C $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel} clean
-rm -rf $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}/*/o
+mv $RPM_BUILD_ROOT%{_datadir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
+%{__rm} $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}_PLD
+%endif
+
+# cleanup lowercased variants, not used in any script (less cruft)
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxautostart
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxheadless
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxmanage
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/vboxsdl
+
+# cleanup unpackaged
+%{__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.*
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/vboxapi*
+
+%if %{with gui}
+# cleanup lowercased variants, not used in any script (less cruft)
+%{__rm} -r $RPM_BUILD_ROOT%{_bindir}/virtualbox
+# weird icon size
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/40x40
+%endif
 
-cp -a PLD-MODULE-BUILD/GuestDrivers/* $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel}
-cp -p src/VBox/Additions/common/VBoxGuest/linux/dkms.conf $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel}
-%{__make} -C $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel} clean
-rm -rf $RPM_BUILD_ROOT%{_usrsrc}/vboxguest-%{version}-%{rel}/*/o
+# duplicate, we already have virtualbox.png (128x128), this is 32x32
+%{__rm} -r $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
+
+%if %{with doc}
+ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual.pdf
+%if %{with all_langs}
+ln -sf %{_docdir}/%{pname}-doc-%{version}/UserManual_fr_FR.pdf $RPM_BUILD_ROOT%{_libdir}/%{pname}/UserManual_fr_FR.pdf
+%endif
 %endif
 %endif
 
@@ -715,6 +775,9 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 221 -r -f vbox
 
 %post
+/sbin/chkconfig --add vboxautostart
+%service -n vboxautostart restart
+
 for i in /sys/bus/usb/devices/*; do
 	if [ -r "$i/dev" ]; then
 		dev="`cat "$i/dev" 2>/dev/null || true`"
@@ -734,6 +797,13 @@ On Guest Linux system you might want to install:
 
 EOF
 
+%preun
+if [ "$1" = "0" ]; then
+	/sbin/chkconfig --del vboxautostart
+	%service vboxautostart -q stop
+fi
+
+
 %postun
 if [ "$1" = "0" ]; then
 	%groupremove vbox
@@ -741,12 +811,19 @@ fi
 
 %post gui
 %update_desktop_database
+%update_icon_cache hicolor
 %update_mime_database
 
 %postun gui
 %update_desktop_database
+%update_icon_cache hicolor
 %update_mime_database
 
+%pre guest
+# Add a group "vboxsf" for Shared Folders access
+# All users which want to access the auto-mounted Shared Folders have to be added to this group.
+%groupadd -g 266 -r -f vboxsf
+
 %post guest
 /sbin/chkconfig --add vboxservice
 %service vboxservice restart
@@ -760,6 +837,9 @@ fi
 %systemd_preun vboxservice.service
 
 %postun guest
+if [ "$1" = "0" ]; then
+	%groupremove vboxsf
+fi
 %systemd_reload
 
 %triggerpostun guest -- VirtualBox-guest < 4.3.0-1
@@ -769,162 +849,193 @@ fi
 %addusertogroup xdm vbox
 
 %post -n dkms-vboxguest
-set -x
 dkms add -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms build -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms install -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade || :
 
 %preun -n dkms-vboxguest
-set -x
 dkms remove -m vboxguest -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %post -n dkms-vboxhost
-set -x
 dkms add -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms build -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade && \
 dkms install -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade || :
 
 %preun -n dkms-vboxhost
-set -x
 dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{pname}
-%dir %{_libdir}/%{pname}/ExtensionPacks
-%dir %{_libdir}/%{pname}/ExtensionPacks/VNC
-%dir %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*
-%dir %{_libdir}/%{pname}/additions
-%dir %{_libdir}/%{pname}/components
-%attr(755,root,root) %{_bindir}/VBoxBFE
+%dir %attr(751,root,root) %{_sysconfdir}/vbox
+%dir %attr(770,root,vbox) %{_sysconfdir}/vbox/autostart
+%attr(640,root,vbox) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vbox/autostart.cfg
+%attr(754,root,root) /etc/rc.d/init.d/vboxautostart
+%attr(755,root,root) /sbin/mount.vdi
+%attr(755,root,root) %{_bindir}/VBox
+%attr(755,root,root) %{_bindir}/VBoxAutostart
+%attr(755,root,root) %{_bindir}/VBoxBalloonCtrl
+%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}/VBoxSVC
 %attr(755,root,root) %{_bindir}/VBoxTunctl
-%attr(755,root,root) %{_bindir}/VBoxXPCOMIPCD
-%attr(755,root,root) /sbin/mount.vdi
-%attr(755,root,root) %{_libdir}/%{pname}/DBGCPlugInDiggers.so
+%attr(755,root,root) %{_bindir}/vbox-img
+%dir %{_libdir}/%{pname}
+# libraries
+%attr(755,root,root) %{_libdir}/%{pname}/DbgPlugInDiggers.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuth.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxAuthSimple.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxDD2.so
 %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}/VBoxDragAndDropSvc.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxExtPackHelperApp
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestControlSvc.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxGuestPropSvc.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxHeadless
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxHostChannel.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxKeyboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
-%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
-%if %{with doc}
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
-%endif
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhostcrutil.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLhosterrorspu.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxOGLrenderspu.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}/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
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMC.so
 %ifarch %{ix86}
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxREM32.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxREM64.so
 %endif
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxRT.so
+
+# binaries
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxAutostart
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxBalloonCtrl
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxExtPackHelperApp
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxHeadless
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxManage
+%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}/VBoxSharedClipboard.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedCrOpenGL.so
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSharedFolders.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSysInfo.sh
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMM.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMC.so
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOM.so
-%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox-wrapper.sh
+%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
+%if %{with doc}
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
+%endif
+%dir %{_libdir}/%{pname}/tools
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTHttp
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTLdrFlt
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTManifest
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTRm
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTShutdown
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTSignTool
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTTar
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTUnzip
+%attr(755,root,root) %{_libdir}/%{pname}/tools/scm
+
+%dir %{_libdir}/%{pname}/ExtensionPacks
+%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
+%dir %{_libdir}/%{pname}/ExtensionPacks/VNC
+%dir %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*
 %attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/VNC/linux*/VBoxVNC*.so
-%{_libdir}/%{pname}/VBoxDD2GC.debug
-%{_libdir}/%{pname}/VBoxDD2GC.gc
+%dir %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/ExtPack.xml
+%dir %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*
+%attr(755,root,root) %{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTrace*.so
+%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.debug
+%{_libdir}/%{pname}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux*/VBoxDTraceR0.r0
+
+%{_libdir}/%{pname}/VBoxCpuReport
 %{_libdir}/%{pname}/VBoxDD2R0.debug
 %{_libdir}/%{pname}/VBoxDD2R0.r0
-%{_libdir}/%{pname}/VBoxDDGC.debug
-%{_libdir}/%{pname}/VBoxDDGC.gc
+%{_libdir}/%{pname}/VBoxDD2RC.debug
+%{_libdir}/%{pname}/VBoxDD2RC.rc
+%{_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}/VMMGC.debug
-%{_libdir}/%{pname}/VMMGC.gc
+%{_libdir}/%{pname}/VMMRC.debug
+%{_libdir}/%{pname}/VMMRC.rc
 %{_libdir}/%{pname}/VMMR0.debug
 %{_libdir}/%{pname}/VMMR0.r0
-%{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
+
+%dir %{_libdir}/%{pname}/components
 %{_libdir}/%{pname}/components/VBoxXPCOMBase.xpt
 %{_libdir}/%{pname}/components/VirtualBox_XPCOM.xpt
 %attr(755,root,root) %{_libdir}/%{pname}/components/VBoxC.so
 %attr(755,root,root) %{_libdir}/%{pname}/components/VBoxSVCM.so
 %attr(755,root,root) %{_libdir}/%{pname}/components/VBoxXPCOMIPCC.so
 
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/virtualbox.rules
+%dir %{_datadir}/%{pname}
+%attr(755,root,root) %{_datadir}/%{pname}/VBoxSysInfo.sh
+
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules
 %attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh
 
+%if %{with gui}
 %files gui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/VirtualBox
-%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
-%{_libdir}/%{pname}/icons
-%dir %{_libdir}/%{pname}/nls
-%lang(bg) %{_libdir}/%{pname}/nls/*_bg.qm
-%lang(ca) %{_libdir}/%{pname}/nls/*_ca.qm
-%lang(ca_VA) %{_libdir}/%{pname}/nls/*_ca_VA.qm
-%lang(cs) %{_libdir}/%{pname}/nls/*_cs.qm
-%lang(da) %{_libdir}/%{pname}/nls/*_da.qm
-%lang(de) %{_libdir}/%{pname}/nls/*_de.qm
-%lang(en) %{_libdir}/%{pname}/nls/*_en.qm
-%lang(es) %{_libdir}/%{pname}/nls/*_es.qm
-%lang(eu) %{_libdir}/%{pname}/nls/*_eu.qm
-%lang(fi) %{_libdir}/%{pname}/nls/*_fa_IR.qm
-%lang(fi) %{_libdir}/%{pname}/nls/*_fi.qm
-%lang(fr) %{_libdir}/%{pname}/nls/*_fr.qm
-%lang(gl_ES) %{_libdir}/%{pname}/nls/*_gl_ES.qm
-%lang(hu) %{_libdir}/%{pname}/nls/*_hu.qm
-%lang(id) %{_libdir}/%{pname}/nls/*_id.qm
-%lang(it) %{_libdir}/%{pname}/nls/*_it.qm
-%lang(ja) %{_libdir}/%{pname}/nls/*_ja.qm
-%lang(km_KH) %{_libdir}/%{pname}/nls/*_km_KH.qm
-%lang(ko) %{_libdir}/%{pname}/nls/*_ko.qm
-%lang(lt) %{_libdir}/%{pname}/nls/*_lt.qm
-%lang(nl) %{_libdir}/%{pname}/nls/*_nl.qm
-%lang(pl) %{_libdir}/%{pname}/nls/*_pl.qm
-%lang(pt) %{_libdir}/%{pname}/nls/*_pt.qm
-%lang(pt_BR) %{_libdir}/%{pname}/nls/*_pt_BR.qm
-%lang(ro) %{_libdir}/%{pname}/nls/*_ro.qm
-%lang(ru) %{_libdir}/%{pname}/nls/*_ru.qm
-%lang(sk) %{_libdir}/%{pname}/nls/*_sk.qm
-%lang(sr) %{_libdir}/%{pname}/nls/*_sr.qm
-%lang(sv) %{_libdir}/%{pname}/nls/*_sv.qm
-%lang(tr) %{_libdir}/%{pname}/nls/*_tr.qm
-%lang(uk) %{_libdir}/%{pname}/nls/*_uk.qm
-%lang(zh_CN) %{_libdir}/%{pname}/nls/*_zh_CN.qm
-%lang(zh_TW) %{_libdir}/%{pname}/nls/*_zh_TW.qm
-%{_pixmapsdir}/virtualbox.png
+%attr(755,root,root) %{_libdir}/%{pname}/VirtualBox
+%dir %{_datadir}/%{pname}/nls
+%lang(bg) %{_datadir}/%{pname}/nls/*_bg.qm
+%lang(ca) %{_datadir}/%{pname}/nls/*_ca.qm
+%lang(ca_VA) %{_datadir}/%{pname}/nls/*_ca_VA.qm
+%lang(cs) %{_datadir}/%{pname}/nls/*_cs.qm
+%lang(da) %{_datadir}/%{pname}/nls/*_da.qm
+%lang(de) %{_datadir}/%{pname}/nls/*_de.qm
+%lang(en) %{_datadir}/%{pname}/nls/*_el.qm
+%lang(en) %{_datadir}/%{pname}/nls/*_en.qm
+%lang(es) %{_datadir}/%{pname}/nls/*_es.qm
+%lang(eu) %{_datadir}/%{pname}/nls/*_eu.qm
+%lang(fi) %{_datadir}/%{pname}/nls/*_fa_IR.qm
+%lang(fi) %{_datadir}/%{pname}/nls/*_fi.qm
+%lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm
+%lang(gl_ES) %{_datadir}/%{pname}/nls/*_gl_ES.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(km_KH) %{_datadir}/%{pname}/nls/*_km_KH.qm
+%lang(ko) %{_datadir}/%{pname}/nls/*_ko.qm
+%lang(lt) %{_datadir}/%{pname}/nls/*_lt.qm
+%lang(nl) %{_datadir}/%{pname}/nls/*_nl.qm
+%lang(pl) %{_datadir}/%{pname}/nls/*_pl.qm
+%lang(pt) %{_datadir}/%{pname}/nls/*_pt.qm
+%lang(pt_BR) %{_datadir}/%{pname}/nls/*_pt_BR.qm
+%lang(ro) %{_datadir}/%{pname}/nls/*_ro.qm
+%lang(ru) %{_datadir}/%{pname}/nls/*_ru.qm
+%lang(sk) %{_datadir}/%{pname}/nls/*_sk.qm
+%lang(sr) %{_datadir}/%{pname}/nls/*_sr.qm
+%lang(sv) %{_datadir}/%{pname}/nls/*_sv.qm
+%lang(tr) %{_datadir}/%{pname}/nls/*_tr.qm
+%lang(uk) %{_datadir}/%{pname}/nls/*_uk.qm
+%lang(zh_CN) %{_datadir}/%{pname}/nls/*_zh_CN.qm
+%lang(zh_TW) %{_datadir}/%{pname}/nls/*_zh_TW.qm
 %{_desktopdir}/virtualbox.desktop
+%{_pixmapsdir}/virtualbox.png
+%{_iconsdir}/hicolor/*/apps/virtualbox.png
+%{_iconsdir}/hicolor/*/apps/virtualbox.svg
+%{_iconsdir}/hicolor/*/mimetypes/virtualbox-*.png
 %{_datadir}/mime/packages/virtualbox.xml
+%endif
 
 %files additions
 %defattr(644,root,root,755)
-%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
+%{_datadir}/%{pname}/VBoxGuestAdditions.iso
 
 %files guest
 %defattr(644,root,root,755)
@@ -936,21 +1047,14 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %files guest-x11
 %defattr(644,root,root,755)
-# NOTE: unfinished, should contain .desktop files for starting up mouse
-# integration and other desktop services
-# NOTE: the filelist is incomplete too
-%attr(755,root,root) %{_bindir}/VBoxClient
-/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
 /etc/xdg/autostart/vboxclient.desktop
-
-%attr(755,root,root) %{_libdir}/%{pname}/additions/autorun.sh
-%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
+%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
@@ -971,11 +1075,15 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %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)