From 5a84bef82e464d73ad69981733c48ad6036c97b6 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Dec 09 2020 20:22:32 +0000 Subject: Rebase to qemu-5.2.0 GA Fix spice and GL UI module deps (bz 1904603) Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index b8795e6..0b76070 100644 --- a/qemu.spec +++ b/qemu.spec @@ -209,7 +209,7 @@ %{obsoletes_block_rbd} # Release candidate version tracking -%global rcver rc4 +#global rcver rc4 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} @@ -219,7 +219,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 5.2.0 -Release: 0.9%{?rcrel}%{?dist} +Release: 1%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -568,18 +568,21 @@ This package provides the additional curses UI for QEMU. %package ui-gtk Summary: QEMU GTK UI driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl{?_isa} = %{epoch}:%{version}-%{release} %description ui-gtk This package provides the additional GTK UI for QEMU. %package ui-sdl Summary: QEMU SDL UI driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl{?_isa} = %{epoch}:%{version}-%{release} %description ui-sdl This package provides the additional SDL UI for QEMU. %package ui-egl-headless Summary: QEMU EGL headless driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl{?_isa} = %{epoch}:%{version}-%{release} %description ui-egl-headless This package provides the additional egl-headless UI for QEMU. @@ -630,30 +633,36 @@ This package provides the USB smartcard device for QEMU. %package ui-spice-core Summary: QEMU spice-core UI driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl{?_isa} = %{epoch}:%{version}-%{release} %description ui-spice-core This package provides the additional spice-core UI for QEMU. %package ui-spice-app Summary: QEMU spice-app UI driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-chardev-spice{?_isa} = %{epoch}:%{version}-%{release} %description ui-spice-app This package provides the additional spice-app UI for QEMU. %package device-display-qxl Summary: QEMU QXL display device Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core{?_isa} = %{epoch}:%{version}-%{release} %description device-display-qxl This package provides the QXL display device for QEMU. %package char-spice Summary: QEMU spice chardev driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core{?_isa} = %{epoch}:%{version}-%{release} %description char-spice This package provides the spice chardev driver for QEMU. %package audio-spice Summary: QEMU spice audio driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core{?_isa} = %{epoch}:%{version}-%{release} %description audio-spice This package provides the spice audio driver for QEMU. %endif @@ -1907,6 +1916,10 @@ getent passwd qemu >/dev/null || \ %changelog +* Wed Dec 09 2020 Cole Robinson - 5.2.0-1 +- Rebase to qemu-5.2.0 GA +- Fix spice and GL UI module deps (bz 1904603) + * Thu Dec 03 2020 Richard W.M. Jones - 5.2.0-0.9.rc4 - Enable qemu-kvm-core package on riscv64. diff --git a/sources b/sources index 255d372..6a86af7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-5.2.0-rc4.tar.xz) = 47e918392609c34f904962e5759125485407ae52c273053729054300e10fc67fc7ed443c9af25d1d852a5f5c70eee125c703ce15d0e571068848f405de33db3b +SHA512 (qemu-5.2.0.tar.xz) = bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3