install VBoxClient-all, drop xinitrc.d, assume modern desktop for autostart stuff

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index f78deab2d3e933ab625e11099d93142cc818139f..39bbd28c75b8d3ac3bc2c6acf4e1caec7637452b 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -288,9 +288,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}
@@ -632,11 +633,10 @@ cp -a$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditio
 %{__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
-install -d $RPM_BUILD_ROOT/etc/{X11/xinit/xinitrc.d,xdg/autostart}
-install -p -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-       $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+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
 
@@ -980,12 +980,9 @@ 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) %{_bindir}/VBoxClient
+%attr(755,root,root) %{_bindir}/VBoxClient-all
 
 %if 0
 %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd