- rel 1

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 7a9e0b241c971d5da0a6cbb0c72262dd92019a47..5776d53b512cd4feffc8d0a59db7993ddb99dcc1 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.16
+Version:       6.1.34
 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: a12a647f6c114f2cb1571089b36841fe
-Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 5710cdc38e4d7185b3df1c969b4cb267
+Source0:       https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
+# Source0-md5: 5ee5e141a7bd6251420e7d7a2cc76206
+Source1:       https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
+# Source1-md5: 16cfa062d19f4578f6bd24648b99eca4
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       vboxservice.sysconfig
@@ -87,6 +87,9 @@ Patch14:      %{pname}-multipython.patch
 Patch15:       %{pname}-lightdm-1.19.2.patch
 Patch16:       %{pname}-no-vboxvideo.patch
 Patch17:       qt5-gl.patch
+Patch18:       qt-detect.patch
+Patch19:       kernel-4.9.256.patch
+Patch20:       kernel-5.18.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -139,7 +142,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 +163,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
@@ -278,9 +281,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.
@@ -365,9 +366,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
@@ -385,9 +384,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
@@ -470,11 +467,13 @@ gospodarzem sprzętu PCI.\
 %config(noreplace) %verify(not md5 mtime size) /etc/depmod.d/%{_kernel_ver}/vboxguest.conf\
 %endif\
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 14 0}\
 /lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\
 /lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\
 %if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
 /lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*\
 %endif\
+%endif\
 \
 %if %{with host}\
 %files -n kernel%{_alt_kernel}-virtualbox-host\
@@ -510,6 +509,7 @@ cd kernel/HostDrivers\
 %install_kernel_modules -D ../../kernel/installed -m vboxdrv/vboxdrv,vboxnetadp/vboxnetadp,vboxnetflt/vboxnetflt -d misc\
 cd ../..\
 %endif\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 14 0}\
 cd kernel/GuestDrivers\
 %build_kernel_modules -m vboxguest -C vboxguest\
 %build_kernel_modules -m vboxsf -C vboxsf KBUILD_EXTRA_SYMBOLS=$PWD/../vboxguest/Module.symvers\
@@ -519,6 +519,7 @@ cd kernel/GuestDrivers\
 %install_kernel_modules -D ../../kernel/installed -m vboxvideo/vboxvideo -d misc\
 %endif\
 cd ../..\
+%endif\
 %{nil}
 
 %define install_kernel_pkg()\
@@ -553,6 +554,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
+%patch18 -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 +574,8 @@ 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
+%patch20 -p1
 %endif
 
 # using system kBuild package
@@ -617,7 +621,6 @@ VBOX_WITH_TESTSUITE :=
 VBOX_WITH_VRDP_RDESKTOP=
 VBOX_WITH_MULTIVERSION_PYTHON=0
 %{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1}
-VBOX_WITH_VIRTIO=
 EOF
 
 %undefine      filterout_c