diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 7e5000e..d83bcbb 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -23,6 +23,13 @@ %global have_clang 1 %global have_safe_stack 0 +%global have_spice 0 +%if 0%{?almalinux} +%global have_spice 1 +%ifnarch x86_64 aarch64 +%global have_spice 0 +%endif +%endif %if %{have_clang} %global toolchain clang @@ -102,6 +109,9 @@ #Versions of various parts: %global requires_all_modules \ +%if %{have_spice} \ +Requires: %{name}-ui-spice = %{epoch}:%{version}-%{release} \ +%endif \ %if %{have_opengl} \ Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} \ Requires: %{name}-ui-egl-headless = %{epoch}:%{version}-%{release} \ @@ -134,7 +144,9 @@ Requires: %{name}-audio-pa = %{epoch}:%{version}-%{release} # Note: ssh driver wasn't removed yet just disabled due to late handling %global obsoletes_some_modules \ +%if !%{have_spice} \ Obsoletes: %{name}-ui-spice <= %{epoch}:%{version} \ +%endif \ Obsoletes: %{name}-block-gluster <= %{epoch}:%{version} \ Obsoletes: %{name}-block-iscsi <= %{epoch}:%{version} \ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \ @@ -143,7 +155,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 9.0.0 -Release: 7%{?rcrel}%{?dist}%{?cc_suffix} +Release: 7%{?rcrel}%{?dist}%{?cc_suffix}.alma.1 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch 15 used for RHEL 8 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5) @@ -317,6 +329,12 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: spice-protocol BuildRequires: capstone-devel +%if %{have_spice} +BuildRequires: spice-server-devel +BuildRequires: libcacard-devel +BuildRequires: nss-devel +%endif + # Requires for qemu-kvm package Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: %{name}-docs = %{epoch}:%{version}-%{release} @@ -486,6 +504,17 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} %description audio-pa This package provides the additional PulseAudio audio driver for QEMU. +%if %{have_spice} +%package ui-spice +Summary: QEMU spice support +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%if %{have_opengl} +Requires: %{name}-ui-opengl%{?_isa} = %{epoch}:%{version}-%{release} +%endif + +%description ui-spice +This package provides spice support. +%endif %if %{have_opengl} %package ui-opengl @@ -807,6 +836,10 @@ run_configure \ --enable-selinux \ --enable-slirp \ --enable-snappy \ +%if 0%{have_spice} + --enable-smartcard \ + --enable-spice \ +%endif --enable-spice-protocol \ --enable-system \ --enable-tcg \ @@ -1028,6 +1061,8 @@ rm -rf %{buildroot}%{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.* rm -rf %{buildroot}%{_datadir}/%{name}/qemu-nsis.bmp rm -rf %{buildroot}%{_datadir}/%{name}/npcm7xx_bootrom.bin +rm -rf %{buildroot}%{_libdir}/%{name}/ui-spice-app.so + # Remove virtfs-proxy-helper files rm -rf %{buildroot}%{_libexecdir}/virtfs-proxy-helper rm -rf %{buildroot}%{_mandir}/man1/virtfs-proxy-helper* @@ -1282,6 +1317,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files audio-pa %{_libdir}/%{name}/audio-pa.so +%if 0%{have_spice} +%files ui-spice + %{_libdir}/%{name}/hw-usb-smartcard.so + %{_libdir}/%{name}/audio-spice.so + %{_libdir}/%{name}/ui-spice-core.so + %{_libdir}/%{name}/chardev-spice.so +%endif + %if %{have_opengl} %files ui-opengl %{_libdir}/%{name}/ui-opengl.so @@ -1307,6 +1350,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Thu Aug 22 2024 Eduard Abdullin - 9.0.0-7.alma.1 +- Re-added Spice support + * Thu Aug 15 2024 Miroslav Rezanina - 9.0.0-7 - kvm-linux-aio-add-IO_CMD_FDSYNC-command-support.patch [RHEL-51901] - kvm-nbd-server-Plumb-in-new-args-to-nbd_client_add.patch [RHEL-52599]