X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=VirtualBox.spec;h=0d4660d0729961ec6461753ceb69e5d098277cb2;hp=80e09b05682910b72fb23c59a29eaa3be7146126;hb=95d7827;hpb=a174188e88c6a3cb99b6f43f3cc59381a102346f diff --git a/VirtualBox.spec b/VirtualBox.spec index 80e09b0..0d4660d 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -42,19 +42,19 @@ exit 1 %define qtver 5.3.2 -%define rel 1 +%define rel 2 %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: 5.1.6 +Version: 5.1.16 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: 8c2331a718cfc038963c1214c2ba9811 +# Source0-md5: 37ebbd51370841eed8ab80f2f38446d6 Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 712a7264ccdc0af459faa2c396f31d98 +# Source1-md5: 967b230bd9fdedf7c9d05f9e23b3c8e6 Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -79,6 +79,9 @@ Patch11: 18-system-xorg.patch Patch12: %{pname}-all-translations.patch Patch13: x32.patch Patch14: %{pname}-no-scrextend.patch +Patch15: %{pname}-multipython.patch +Patch16: %{pname}-lightdm-1.19.2.patch +Patch17: %{pname}-no-vboxvideo.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -238,6 +241,7 @@ Summary: Qt GUI part for VirtualBox Group: X11/Applications Requires: %{name} = %{version}-%{release} Requires: Qt5Core >= %{qtver} +Requires: Qt5Gui-platform-xcb >= %{qtver} Requires: desktop-file-utils Requires: desktop-file-utils Requires: fontconfig @@ -245,6 +249,8 @@ Requires: fonts-Type1-urw Requires: gtk-update-icon-cache Requires: hicolor-icon-theme Requires: shared-mime-info +Suggests: Qt5Gui-platform-xcb-glx >= %{qtver} +Suggests: Qt5Gui-platform-xcb-egl >= %{qtver} Suggests: gxmessage Conflicts: %{name} < 4.3.8-3 @@ -301,7 +307,7 @@ Group: X11/Applications Requires: %{name}-guest = %{version}-%{release} Requires: xorg-app-xrandr Requires: xorg-driver-video-vboxvideo = %{version}-%{release} -Suggests: kernel(vboxvideo) +Requires: kernel(vboxvideo) Obsoletes: xorg-driver-input-vboxmouse < %{version}-%{release} %description guest-x11 @@ -348,12 +354,12 @@ Summary: X.org video driver for VirtualBox guest OS Summary(pl.UTF-8): Sterownik grafiki dla systemu gościa w VirtualBoksie Group: X11/Applications Requires: Mesa-dri-driver-swrast +Requires: xorg-driver-video-modesetting Requires: xorg-xserver-libdri >= 1.7.4 Requires: xorg-xserver-server >= 1.0.99.901 %{?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 @@ -531,6 +537,9 @@ cd ../..\ %endif %patch13 -p1 %patch14 -p1 +%patch15 -p0 +%patch16 -p0 +%patch17 -p0 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -592,6 +601,7 @@ VBOX_WITH_TESTCASES := VBOX_WITH_TESTSUITE := VBOX_WITH_VRDP_RDESKTOP= +VBOX_WITH_MULTIVERSION_PYTHON=0 EOF %undefine filterout_c @@ -648,7 +658,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso # 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}}/VBoxEGL.so %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so @@ -725,7 +734,6 @@ ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxAutostart ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv ln -sf %{_libdir}/%{pname}/vbox-img $RPM_BUILD_ROOT%{_bindir}/vbox-img ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxDTrace -ln -sf %{_libdir}/%{pname}/rdesktop-vrdp $RPM_BUILD_ROOT%{_bindir}/rdesktop-vrd cp -p $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons/128x128/virtualbox.png $RPM_BUILD_ROOT%{_pixmapsdir}/virtualbox.png mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.desktop $RPM_BUILD_ROOT%{_desktopdir}/virtualbox.desktop mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/virtualbox.xml @@ -751,7 +759,7 @@ cd - done ) -rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons +rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules @@ -904,6 +912,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_bindir}/VBoxHeadless %attr(755,root,root) %{_bindir}/VBoxManage %attr(755,root,root) %{_bindir}/VBoxSDL +%attr(755,root,root) %{_bindir}/VBoxVRDP %attr(755,root,root) %{_bindir}/vbox-img %dir %{_libdir}/%{pname} # libraries @@ -1013,9 +1022,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %if %{with gui} %files gui %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/VBoxVRDP %attr(755,root,root) %{_bindir}/VirtualBox -%attr(755,root,root) %{_bindir}/rdesktop-vrd %attr(755,root,root) %{_libdir}/%{pname}/VBoxDbg.so %attr(755,root,root) %{_libdir}/%{pname}/VBoxTestOGL %attr(755,root,root) %{_libdir}/%{pname}/VirtualBox @@ -1119,7 +1126,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %files -n xorg-driver-video-vboxvideo %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %attr(755,root,root) %{_libdir}/xorg/modules/dri/vboxvideo_dri.so # vboxvideo_dri.so deps %attr(755,root,root) %{_libdir}/VBoxEGL.so