X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=VirtualBox.spec;h=7e26aa9d5e245158b72641431cbb1ec215bb70c0;hb=9e4dd6a9479418e4bbf936847fae6599dbaacb8e;hp=ab7d7e90f315a8c63231c9d39349989622df0561;hpb=53a63bfec10bc4118d348b1b347465ca61ca4aa1;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index ab7d7e9..7e26aa9 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -15,6 +15,7 @@ %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 verbose %bcond_with force_userspace # force userspace build (useful if alt_kernel is set) @@ -32,7 +33,7 @@ %define _enable_debug_packages 0 %endif -%define rel 4 +%define rel 8 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -45,6 +46,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 @@ -67,6 +69,8 @@ Patch3: %{pname}-dri.patch Patch4: %{pname}-disable_build_NetBiosBin.patch Patch5: xserver-1.12.patch Patch6: gcc48.patch +Patch7: lightdm-greeter-glib-includes.patch +Patch8: lightdm-greeter-g++-link.patch # ubuntu patches Patch10: 16-no-update.patch Patch11: 18-system-xorg.patch @@ -116,6 +120,7 @@ BuildRequires: libvncserver-devel >= 0.9.9 BuildRequires: libxml2-devel >= 2.6.26 BuildRequires: libxslt-devel >= 1.1.17 BuildRequires: libxslt-progs >= 1.1.17 +%{?with_lightdm:BuildRequires: lightdm-devel} BuildRequires: makeself BuildRequires: mkisofs BuildRequires: pam-devel @@ -126,7 +131,7 @@ BuildRequires: python-devel BuildRequires: python-modules BuildRequires: qt4-build >= 4.2.0 BuildRequires: qt4-linguist -BuildRequires: rpmbuild(macros) >= 1.627 +BuildRequires: rpmbuild(macros) >= 1.664 BuildRequires: sed >= 4.0 %if %{with doc} BuildRequires: texlive-fonts-bitstream @@ -168,6 +173,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %endif %define vbox_platform linux.%{vbox_arch} %define outdir out/%{vbox_platform}/release/bin +%define objdir out/%{vbox_platform}/release/obj %define _sbindir /sbin # workaround buggy 'file' results: @@ -254,19 +260,45 @@ 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 +Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts +Suggests: kernel(vboxguest) +Suggests: kernel(vboxsf) +Suggests: pam-pam_vbox + +%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 lightdm-greeter-vbox +Summary: VirtualBox greeter for lightdm +Group: Themes +URL: http://www.virtualbox.org/manual/ch09.html#autologon_unix_lightdm +Requires: lightdm >= 1.0.1 +Provides: lightdm-greeter + +%description -n lightdm-greeter-vbox +VirtualBox greeter for LightDM. %package -n pam-pam_vbox Summary: PAM module to perform automated guest logons @@ -468,7 +500,7 @@ You should install this package in your Guest OS. Moduł jądra Linuksa dla VirtualBoksa - dostęp do plików systemu głównego z poziomu systemu gościa. -%package -n kernel%{_alt_kernel}-misc-vboxvideo +%package -n kernel%{_alt_kernel}-video-vboxvideo Summary: DRM support for VirtualBox Summary(pl.UTF-8): Moduł jądra Linuksa dla VirtualBoksa Release: %{rel}@%{_kernel_ver_str} @@ -482,12 +514,12 @@ Requires(postun): %releq_kernel %endif Provides: kernel(vboxvideo) = %{version}-%{rel} -%description -n kernel%{_alt_kernel}-misc-vboxvideo +%description -n kernel%{_alt_kernel}-video-vboxvideo DRM support for VirtualBox. You should install this package in your Guest OS. -%description -n kernel%{_alt_kernel}-misc-vboxvideo -l pl.UTF-8 +%description -n kernel%{_alt_kernel}-video-vboxvideo -l pl.UTF-8 Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM. %prep @@ -499,6 +531,8 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -544,6 +578,10 @@ kmk %{?_smp_mflags} \ VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \ XSERVER_VERSION="$XSERVER_VERSION" \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \ +%if %{with lightdm} + VBOX_WITH_LIGHTDM_GREETER=1 \ + VBOX_WITH_LIGHTDM_GREETER_PACKING=1 \ +%endif TOOL_GCC3_CFLAGS="%{rpmcflags}" \ TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \ VBOX_GCC_OPT="%{rpmcxxflags}" \ @@ -634,6 +672,12 @@ install -p -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \ $RPM_BUILD_ROOT/etc/xdg/autostart/vboxclient.desktop +%if %{with lightdm} +install -d $RPM_BUILD_ROOT%{_datadir}/xgreeters +install -p %{objdir}/vbox-greeter/vbox-greeter $RPM_BUILD_ROOT%{_sbindir} +cp -p %{objdir}/Additions/Installer/linux/share/VBoxGuestAdditions/vbox-greeter.desktop $RPM_BUILD_ROOT%{_datadir}/xgreeters +%endif + # unknown - checkme %if 1 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{pname}/SUPInstall @@ -665,6 +709,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 @@ -728,7 +773,7 @@ Additionally you might want to install: On Guest Linux system you might want to install: kernel-misc-vboxguest-%{version}-%{rel}@%{_kernel_ver_str} kernel-misc-vboxsf-%{version}-%{rel}@%{_kernel_ver_str} - kernel-misc-vboxvideo-%{version}-%{rel}@%{_kernel_ver_str} + kernel-video-vboxvideo-%{version}-%{rel}@%{_kernel_ver_str} EOF @@ -737,6 +782,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 @@ -809,10 +864,10 @@ fi %postun -n kernel%{_alt_kernel}-misc-vboxsf %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-misc-vboxvideo +%post -n kernel%{_alt_kernel}-video-vboxvideo %depmod %{_kernel_ver} -%postun -n kernel%{_alt_kernel}-misc-vboxvideo +%postun -n kernel%{_alt_kernel}-video-vboxvideo %depmod %{_kernel_ver} %post kernel-init-host @@ -977,12 +1032,17 @@ fi %files guest %defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/mount.vboxsf +%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 @@ -991,6 +1051,13 @@ fi %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-service %attr(755,root,root) %{_libdir}/%{pname}/additions/vboxadd-x11 +%if %{with lightdm} +%files -n lightdm-greeter-vbox +%defattr(644,root,root,755) +%attr(755,root,root) %{_sbindir}/vbox-greeter +%{_datadir}/xgreeters/vbox-greeter.desktop +%endif + %files -n pam-pam_vbox %defattr(644,root,root,755) %attr(755,root,root) /%{_lib}/security/pam_vbox.so @@ -1066,10 +1133,9 @@ fi %files -n kernel%{_alt_kernel}-misc-vboxsf %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxsf.conf -%attr(755,root,root) %{_sbindir}/mount.vboxsf /lib/modules/%{_kernel_ver}/misc/vboxsf.ko* -%files -n kernel%{_alt_kernel}-misc-vboxvideo +%files -n kernel%{_alt_kernel}-video-vboxvideo %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vboxvideo.ko* %endif