bring back "DECLCALLBACK generates incorrect code on ix86, remove it" as 32bit.patch

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 3283e966dcdffa0791ded2a1c19a4e6ad3394878..713808782142abbe78a28dc5a8b6e3a181f1ffa9 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -52,14 +52,14 @@ exit 1
 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.8
+Version:       6.1.18
 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: 17bf20786de812186f607f07ba7fa076
+# Source0-md5: c61001386eb3822ab8f06d688a82e84b
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 9e4f570698175108bc16415cdc31e280
+# Source1-md5: dc3c3f818d27a78f1accfcda05e13f85
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       vboxservice.sysconfig
@@ -87,7 +87,7 @@ Patch14:      %{pname}-multipython.patch
 Patch15:       %{pname}-lightdm-1.19.2.patch
 Patch16:       %{pname}-no-vboxvideo.patch
 Patch17:       qt5-gl.patch
-Patch18:       qt5.15.patch
+Patch18:       32bit.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -161,7 +161,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
@@ -200,6 +200,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
@@ -277,9 +279,7 @@ This package contains VirtualBox User Manual.
 Summary:       VirtualBox Guest Additions
 Group:         Base
 Requires:      %{name} = %{version}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description additions
 VirtualBox Guest Additions.
@@ -364,9 +364,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
+%{?noarchpackage}
 
 %description -n dkms-vboxguest
 This package contains DKMS-ready VirtualBox Guest Additions for Linux
@@ -384,9 +382,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
+%{?noarchpackage}
 
 %description -n dkms-vboxhost
 This package contains DKMS enabled sourcecode of VirtualBox Support
@@ -674,6 +670,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 \
@@ -970,6 +967,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
@@ -1060,6 +1058,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
@@ -1134,6 +1133,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