- release 2 (by relup.sh)

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index e6c1180e6c9fd1276d42ce3d929768aae83219a6..24282902df148d4a1381aa3c64678d7907e732ac 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.12
 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: 58fd51b90358ac42811e044988d53438
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 0a881c307e66ad963b3a4015b402035b
+# Source1-md5: 54fb52bd79b706a2c8cf520530a527c5
 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}
@@ -301,7 +304,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 +351,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 +534,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 +573,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 +598,7 @@ VBOX_WITH_TESTCASES :=
 VBOX_WITH_TESTSUITE :=
 
 VBOX_WITH_VRDP_RDESKTOP=
+VBOX_WITH_MULTIVERSION_PYTHON=0
 EOF
 
 %undefine      filterout_c
@@ -635,9 +642,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 +655,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
@@ -728,7 +736,6 @@ cp -p $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons/128x128/virtualbox.png $RPM_BUILD
 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
 
-install -d $RPM_BUILD_ROOT%{_datadir}/%{pname}
 mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/nls $RPM_BUILD_ROOT%{_datadir}/%{pname}
 
 (
@@ -750,7 +757,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
@@ -1065,8 +1072,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)
@@ -1119,7 +1125,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