X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=bd585bdf8ed9f59334b95959bd2d7c459d2cb8f8;hb=489518a9f410af71369c3a54d622522bbf772efa;hp=3173bc50ed5abfcdbe691ff7f2722a6fcdb73306;hpb=348ca40e7d5484d0a709cd705086aa4ea3352af8;p=packages%2FVirtualBox.git

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 3173bc5..bd585bd 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,7 +32,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		1
+%define		rel		7
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
@@ -45,6 +45,7 @@ Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version
 # Source0-md5:	654e45054ae6589452508d37403dc800
 Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
 # Source1-md5:	403098e688f9e7f4273de680f6734983
+Source2:	vboxservice.init
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
@@ -66,6 +67,7 @@ Patch2:		%{pname}-warning_workaround.patch
 Patch3:		%{pname}-dri.patch
 Patch4:		%{pname}-disable_build_NetBiosBin.patch
 Patch5:		xserver-1.12.patch
+Patch6:		gcc48.patch
 # ubuntu patches
 Patch10:	16-no-update.patch
 Patch11:	18-system-xorg.patch
@@ -253,19 +255,32 @@ This package contains ISO9660 image with drivers for Guest OS.
 You should install this package in your Host OS.
 
 %package guest
+Summary:	VirtualBox Guest tools
+Group:		Base
+Suggests:	kernel(vboxguest)
+Suggests:	kernel(vboxsf)
+
+%description guest
+Tools that utilize kernel modules for supporting integration with the
+Host, including file sharing.
+
+You should install this package in your Guest OS for base VirtualBox
+communication
+
+%package guest-x11
 Summary:	VirtualBox Guest Additions
 Group:		Base
+Requires:	%{name}-guest = %{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}
+Suggests:	kernel(vboxvideo)
 Obsoletes:	xorg-driver-input-vboxmouse < %{version}-%{release}
 
-%description guest
-Tools that utilize kernel modules for supporting integration with the
-Host, including file sharing and tracking of mouse pointer movement
-and X.org X11 video and mouse driver.
+%description guest-x11
+Tools for X11 session that utilize kernel modules for supporting
+integration with the Host, like tracking of mouse pointer movement and
+X.org X11 video and mouse drivers
 
-You should install this package in your Guest OS.
+You should install this package in your Guest OS for X11 session.
 
 %package -n pam-pam_vbox
 Summary:	PAM module to perform automated guest logons
@@ -497,6 +512,7 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -663,6 +679,7 @@ cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modules-load.d},%{_sbindir},%{systemdunitdir}}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxservice
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
@@ -735,6 +752,16 @@ if [ "$1" = "0" ]; then
 	%groupremove vbox
 fi
 
+%post guest
+/sbin/chkconfig --add vboxservice
+%service vboxservice restart
+
+%postun guest
+if [ "$1" = "0" ]; then
+	/sbin/chkconfig --del vboxservice
+	%service vboxservice -q stop
+fi
+
 %post	-n kernel%{_alt_kernel}-misc-vboxdrv
 %depmod %{_kernel_ver}
 %vbox_kernel_post -d vboxdrv VirtualBox Support Driver
@@ -975,12 +1002,16 @@ fi
 
 %files guest
 %defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxservice
+%attr(755,root,root) %{_bindir}/VBoxControl
+%attr(755,root,root) %{_bindir}/VBoxService
+
+%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
-%attr(755,root,root) %{_bindir}/VBoxControl
-%attr(755,root,root) %{_bindir}/VBoxService
 /etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
 /etc/xdg/autostart/vboxclient.desktop