- add fix for building with gccc 11 on ix86

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0be5968d665757355eb9da9788d763f1afb33e65..1a70f1f1669adb1173acdb0ba394f810a803615f 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.12
+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: 3c351f7fd6376e0bb3c8489505a9450c
-Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 8df4a68f37ec84d1b98d0e09ed640ce5
+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,7 +87,8 @@ Patch14:      %{pname}-multipython.patch
 Patch15:       %{pname}-lightdm-1.19.2.patch
 Patch16:       %{pname}-no-vboxvideo.patch
 Patch17:       qt5-gl.patch
-Patch18:       kernel-5.8.patch
+Patch19:       kernel-4.9.256.patch
+Patch20:       add__divmoddi4.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -140,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
@@ -161,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
@@ -200,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
@@ -277,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.
@@ -364,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
@@ -384,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
@@ -552,7 +549,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
-%patch18 -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
@@ -572,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
@@ -617,7 +615,6 @@ VBOX_WITH_TESTSUITE :=
 VBOX_WITH_VRDP_RDESKTOP=
 VBOX_WITH_MULTIVERSION_PYTHON=0
 %{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1}
-VBOX_WITH_CLOUD_NET=
 EOF
 
 %undefine      filterout_c
@@ -972,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