X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=2199d65aa48b227417f10c6e09d68820018fc552;hb=ce061de62bd840b466902ea312883e53f3c05a35;hp=6d2db1a3187670b95b46fa29661a5d8f1654c038;hpb=44a0c82d9f1af29b4a441d16a091a0454eb64c3a;p=packages%2FVirtualBox.git

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6d2db1a..2199d65 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -71,7 +71,6 @@ Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions
 # Source1-md5:	f23d3980a509418b2dcb614483271ffa
 Source2:	vboxservice.init
 Source3:	vboxservice.service
-Source4:	%{pname}.sh
 Source5:	mount.vdi
 Source6:	udev.rules
 Source7:	%{pname}-virtualbox-host-modules-load.conf
@@ -289,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}
@@ -532,7 +532,6 @@ 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
 
 install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
@@ -634,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
 
@@ -663,11 +661,13 @@ 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
 
-# unknown - checkme
-%if 1
+# 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
@@ -831,58 +831,61 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %files
 %defattr(644,root,root,755)
 %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}/VBoxHeadless
 %attr(755,root,root) %{_bindir}/VBoxManage
 %attr(755,root,root) %{_bindir}/VBoxSDL
 %attr(755,root,root) %{_bindir}/VBoxTunctl
-%attr(755,root,root) %{_bindir}/VBox
-%attr(755,root,root) %{_bindir}/VBoxAutostart
-%attr(755,root,root) %{_bindir}/VBoxBalloonCtrl
 %dir %{_libdir}/%{pname}
+# libraries
 %attr(755,root,root) %{_libdir}/%{pname}/DBGCPlugInDiggers.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}/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}/iPxeBaseBin
+%if %{with doc}
+%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
+%endif
 
 %dir %{_libdir}/%{pname}/ExtensionPacks
 %{_libdir}/%{pname}/ExtensionPacks/VNC/ExtPack.xml
@@ -921,9 +924,9 @@ 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}/VirtualBox
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL
+%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
@@ -979,18 +982,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
-
-%if 0
-%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
-%endif
+%attr(755,root,root) %{_bindir}/VBoxClient
+%attr(755,root,root) %{_bindir}/VBoxClient-all
 
 %if %{with webservice}
 %files webservice