X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=VirtualBox.spec;h=1a70f1f1669adb1173acdb0ba394f810a803615f;hb=5c8fa7a;hp=b2708381def780eb831109ca831e565989909c3e;hpb=7d3addbb2e7773b90edd4005cfe721f92e869783;p=packages%2FVirtualBox.git diff --git a/VirtualBox.spec b/VirtualBox.spec index b270838..1a70f1f 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,19 +47,19 @@ exit 1 %define qtver 5.6.0 -%define rel 3 +%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: 6.1.2 +Version: 6.1.22 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: f4f42fd09857556b04b803fb99cc6905 -Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 85a1ecad6dade9f22ea0b94556b96898 +Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 +# Source0-md5: abb1a20021e5915fe38c666e8c11cf80 +Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso +# Source1-md5: a605386e0c12e2f730f11320f095029c Source2: vboxservice.init Source3: vboxservice.service Source4: vboxservice.sysconfig @@ -87,6 +87,8 @@ Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch +Patch19: kernel-4.9.256.patch +Patch20: add__divmoddi4.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -139,7 +141,7 @@ BuildRequires: kBuild >= 0.1.9998.3093 BuildRequires: libIDL-devel BuildRequires: libcap-static BuildRequires: libdrm-devel -BuildRequires: libpng-devel >= 1.2.5 +BuildRequires: libpng-devel >= 2:1.2.5 BuildRequires: libstdc++-devel >= 5:3.2.3 BuildRequires: libstdc++-static >= 5:3.2.3 BuildRequires: libuuid-devel @@ -160,7 +162,7 @@ BuildRequires: python-devel >= 2.3 BuildRequires: python-modules BuildRequires: qt5-build BuildRequires: qt5-linguist -BuildRequires: rpmbuild(macros) >= 1.715 +BuildRequires: rpmbuild(macros) >= 1.752 BuildRequires: sed >= 4.0 %if %{with doc} BuildRequires: texlive-fonts-bitstream @@ -199,6 +201,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define filterout -Werror=format-security +%define _noautochrpath .*\\.debug$ + %description Oracle VirtualBox is a general-purpose full virtualizer for x86 hardware. Targeted at server, desktop and embedded use, it is now the @@ -276,9 +280,7 @@ This package contains VirtualBox User Manual. Summary: VirtualBox Guest Additions Group: Base Requires: %{name} = %{version} -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description additions VirtualBox Guest Additions. @@ -363,9 +365,7 @@ Summary(pl.UTF-8): Moduły VirtualBoksa do jądra Linuksa dla systemu gościa License: GPL v2+ Group: Base/Kernel Requires: dkms -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description -n dkms-vboxguest This package contains DKMS-ready VirtualBox Guest Additions for Linux @@ -383,9 +383,7 @@ Summary(pl.UTF-8): Moduły jądra Linuksa dla VirtualBoksa License: GPL v2+ Group: Base/Kernel Requires: dkms -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description -n dkms-vboxhost This package contains DKMS enabled sourcecode of VirtualBox Support @@ -523,6 +521,9 @@ cd ../..\ %if %{_kernel_version_code} >= %{_kernel_version_magic 4 16 0}\ install -d kernel/installed/etc/depmod.d/%{_kernel_ver}\ echo override vboxguest %{_kernel_ver} misc > kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\ +%if %{_kernel_version_code} >= %{_kernel_version_magic 5 6 0}\ +echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_kernel_ver}/vboxguest.conf\ +%endif\ %endif\ %{nil} @@ -548,6 +549,7 @@ echo override vboxguest %{_kernel_ver} misc > kernel/installed/etc/depmod.d/%{_k %patch15 -p0 %patch16 -p0 %patch17 -p1 +%patch20 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in @@ -567,6 +569,7 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers ../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz --without-hardening tar -zxf host-modules.tar.gz -C HostDrivers cd - +%patch19 -p1 %endif # using system kBuild package @@ -669,6 +672,7 @@ cp -a$l %{outdir}/* $RPM_BUILD_ROOT%{_libdir}/%{pname} # Guest Only Tools %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxClient %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxControl +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxDRMClient %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_bindir}}/VBoxService install -d $RPM_BUILD_ROOT/etc/xdg/autostart cp -p src/VBox/Additions/x11/Installer/vboxclient.desktop \ @@ -965,6 +969,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %attr(755,root,root) %{_libdir}/%{pname}/VirtualBoxVM %attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports %attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin +%attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount %if %{with doc} %attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp %endif @@ -1055,6 +1060,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : %lang(fr) %{_datadir}/%{pname}/nls/*_fr.qm %lang(gl) %{_datadir}/%{pname}/nls/*_gl.qm %lang(he) %{_datadir}/%{pname}/nls/*_he.qm +%lang(hr) %{_datadir}/%{pname}/nls/*_hr_HR.qm %lang(hu) %{_datadir}/%{pname}/nls/*_hu.qm %lang(id) %{_datadir}/%{pname}/nls/*_id.qm %lang(it) %{_datadir}/%{pname}/nls/*_it.qm @@ -1129,6 +1135,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || : /etc/xdg/autostart/vboxclient.desktop %attr(755,root,root) %{_bindir}/VBoxClient %attr(755,root,root) %{_bindir}/VBoxClient-all +%attr(755,root,root) %{_bindir}/VBoxDRMClient %if %{with lightdm} %files -n lightdm-greeter-vbox