- release 2 (by relup.sh)

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9e2f326aa032f3b76aff894b16a4608a3f20b94d..0d4660d0729961ec6461753ceb69e5d098277cb2 100644 (file)
--- 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.2
+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: aff1647170dd92914cddfbd0254b9773
+# Source0-md5: 37ebbd51370841eed8ab80f2f38446d6
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 0a881c307e66ad963b3a4015b402035b
+# Source1-md5: 967b230bd9fdedf7c9d05f9e23b3c8e6
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       vboxservice.sysconfig
@@ -71,7 +71,7 @@ Patch3:               %{pname}-dri.patch
 Patch4:                wrapper.patch
 Patch5:                xserver-1.12.patch
 Patch6:                hardening-shared.patch
-Patch7:                lightdm-greeter-glib-includes.patch
+Patch7:                lightdm-greeter-makefile.patch
 Patch8:                lightdm-greeter-g++-link.patch
 Patch9:                pld-guest.patch
 Patch10:       16-no-update.patch
@@ -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
@@ -567,7 +576,7 @@ cp -p src/VBox/Frontends/VirtualBox/images/os_{linux26,pld}_64.png
 cat <<'EOF'>> LocalConfig.kmk
 %{?with_verbose:KBUILD_VERBOSE=3}
 USERNAME=%(id -un)
-__VBOX_BUILD_PUBLISHER=_PLD
+VBOX_BUILD_PUBLISHER=_PLD
 VBOX_VERSION_STRING=$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)_PLD
 XSERVER_VERSION=%(rpm -q --queryformat '%{V}\n' xorg-xserver-server-devel | awk -F. '{ print $1 $2 }' 2>/dev/null || echo ERROR)
 VBOX_USE_SYSTEM_XORG_HEADERS=1
@@ -592,6 +601,7 @@ VBOX_WITH_TESTCASES :=
 VBOX_WITH_TESTSUITE :=
 
 VBOX_WITH_VRDP_RDESKTOP=
+VBOX_WITH_MULTIVERSION_PYTHON=0
 EOF
 
 %undefine      filterout_c
@@ -635,9 +645,11 @@ if cp -al COPYING $RPM_BUILD_ROOT/COPYING; then
        %{__rm} $RPM_BUILD_ROOT/COPYING
 fi
 
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pname}
+
 cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname}
-cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso ||
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
+cp -p$l %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso ||
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
 
 %if %{without gui}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
@@ -646,7 +658,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/VBoxGuestAdditions
 
 # 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
@@ -723,11 +734,12 @@ 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
 
+mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/nls $RPM_BUILD_ROOT%{_datadir}/%{pname}
+
 (
 cd $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
 for i in *; do
@@ -747,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
@@ -900,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
@@ -1001,55 +1014,55 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %attr(755,root,root) %{_libdir}/%{pname}/components/VBoxXPCOMIPCC.so
 %attr(755,root,root) %{_libdir}/%{pname}/VBoxSysInfo.sh
 
+%dir %{_datadir}/%{pname}
+
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules
 %attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh
 
 %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
-%dir %{_libdir}/%{pname}/nls
-%lang(bg) %{_libdir}/%{pname}/nls/*_bg.qm
-%lang(ca) %{_libdir}/%{pname}/nls/*_ca.qm
-%lang(ca_VA) %{_libdir}/%{pname}/nls/*_ca_VA.qm
-%lang(cs) %{_libdir}/%{pname}/nls/*_cs.qm
-%lang(da) %{_libdir}/%{pname}/nls/*_da.qm
-%lang(de) %{_libdir}/%{pname}/nls/*_de.qm
-%lang(en) %{_libdir}/%{pname}/nls/*_el.qm
-%lang(en) %{_libdir}/%{pname}/nls/*_en.qm
-%lang(es) %{_libdir}/%{pname}/nls/*_es.qm
-%lang(eu) %{_libdir}/%{pname}/nls/*_eu.qm
-%lang(fi) %{_libdir}/%{pname}/nls/*_fa_IR.qm
-%lang(fi) %{_libdir}/%{pname}/nls/*_fi.qm
-%lang(fr) %{_libdir}/%{pname}/nls/*_fr.qm
-%lang(gl_ES) %{_libdir}/%{pname}/nls/*_gl_ES.qm
-%lang(he) %{_libdir}/%{pname}/nls/*_he.qm
-%lang(hu) %{_libdir}/%{pname}/nls/*_hu.qm
-%lang(id) %{_libdir}/%{pname}/nls/*_id.qm
-%lang(it) %{_libdir}/%{pname}/nls/*_it.qm
-%lang(ja) %{_libdir}/%{pname}/nls/*_ja.qm
-%lang(km_KH) %{_libdir}/%{pname}/nls/*_km_KH.qm
-%lang(ko) %{_libdir}/%{pname}/nls/*_ko.qm
-%lang(lt) %{_libdir}/%{pname}/nls/*_lt.qm
-%lang(nl) %{_libdir}/%{pname}/nls/*_nl.qm
-%lang(pl) %{_libdir}/%{pname}/nls/*_pl.qm
-%lang(pt) %{_libdir}/%{pname}/nls/*_pt.qm
-%lang(pt_BR) %{_libdir}/%{pname}/nls/*_pt_BR.qm
-%lang(ro) %{_libdir}/%{pname}/nls/*_ro.qm
-%lang(ru) %{_libdir}/%{pname}/nls/*_ru.qm
-%lang(sk) %{_libdir}/%{pname}/nls/*_sk.qm
-%lang(sk) %{_libdir}/%{pname}/nls/*_sl.qm
-%lang(sr) %{_libdir}/%{pname}/nls/*_sr.qm
-%lang(sv) %{_libdir}/%{pname}/nls/*_sv.qm
-%lang(tr) %{_libdir}/%{pname}/nls/*_tr.qm
-%lang(uk) %{_libdir}/%{pname}/nls/*_uk.qm
-%lang(zh_CN) %{_libdir}/%{pname}/nls/*_zh_CN.qm
-%lang(zh_TW) %{_libdir}/%{pname}/nls/*_zh_TW.qm
+%dir %{_datadir}/%{pname}/nls
+%lang(bg) %{_datadir}/%{pname}/nls/*_bg.qm
+%lang(ca) %{_datadir}/%{pname}/nls/*_ca.qm
+%lang(ca_VA) %{_datadir}/%{pname}/nls/*_ca_VA.qm
+%lang(cs) %{_datadir}/%{pname}/nls/*_cs.qm
+%lang(da) %{_datadir}/%{pname}/nls/*_da.qm
+%lang(de) %{_datadir}/%{pname}/nls/*_de.qm
+%lang(en) %{_datadir}/%{pname}/nls/*_el.qm
+%lang(en) %{_datadir}/%{pname}/nls/*_en.qm
+%lang(es) %{_datadir}/%{pname}/nls/*_es.qm
+%lang(eu) %{_datadir}/%{pname}/nls/*_eu.qm
+%lang(fi) %{_datadir}/%{pname}/nls/*_fa_IR.qm
+%lang(fi) %{_datadir}/%{pname}/nls/*_fi.qm
+%lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm
+%lang(gl_ES) %{_datadir}/%{pname}/nls/*_gl_ES.qm
+%lang(he) %{_datadir}/%{pname}/nls/*_he.qm
+%lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm
+%lang(id) %{_datadir}/%{pname}/nls/*_id.qm
+%lang(it) %{_datadir}/%{pname}/nls/*_it.qm
+%lang(ja) %{_datadir}/%{pname}/nls/*_ja.qm
+%lang(km_KH) %{_datadir}/%{pname}/nls/*_km_KH.qm
+%lang(ko) %{_datadir}/%{pname}/nls/*_ko.qm
+%lang(lt) %{_datadir}/%{pname}/nls/*_lt.qm
+%lang(nl) %{_datadir}/%{pname}/nls/*_nl.qm
+%lang(pl) %{_datadir}/%{pname}/nls/*_pl.qm
+%lang(pt) %{_datadir}/%{pname}/nls/*_pt.qm
+%lang(pt_BR) %{_datadir}/%{pname}/nls/*_pt_BR.qm
+%lang(ro) %{_datadir}/%{pname}/nls/*_ro.qm
+%lang(ru) %{_datadir}/%{pname}/nls/*_ru.qm
+%lang(sk) %{_datadir}/%{pname}/nls/*_sk.qm
+%lang(sk) %{_datadir}/%{pname}/nls/*_sl.qm
+%lang(sr) %{_datadir}/%{pname}/nls/*_sr.qm
+%lang(sv) %{_datadir}/%{pname}/nls/*_sv.qm
+%lang(tr) %{_datadir}/%{pname}/nls/*_tr.qm
+%lang(uk) %{_datadir}/%{pname}/nls/*_uk.qm
+%lang(zh_CN) %{_datadir}/%{pname}/nls/*_zh_CN.qm
+%lang(zh_TW) %{_datadir}/%{pname}/nls/*_zh_TW.qm
 %{_desktopdir}/virtualbox.desktop
 %{_pixmapsdir}/virtualbox.png
 %{_iconsdir}/hicolor/*/apps/virtualbox.png
@@ -1060,8 +1073,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %files additions
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{pname}/additions
-%{_libdir}/%{pname}/additions/VBoxGuestAdditions.iso
+%{_datadir}/%{pname}/VBoxGuestAdditions.iso
 
 %files guest
 %defattr(644,root,root,755)
@@ -1114,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