- fixed -system-tricore description

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index 30e7d454fa99a769600ad9bdcb8b0131bc53c09f..189a99501a5d22c3b43987df7db1e42e4e50932e 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,48 +1,53 @@
+# TODO:
+# plugins? (probes)

 #
 # Conditional build:
 %bcond_without sdl             # SDL UI and audio support
 #
 # Conditional build:
 %bcond_without sdl             # SDL UI and audio support

+%bcond_without opengl          # Don't require GL deps

 %bcond_without ceph            # Ceph/RBD support
 %bcond_without glusterfs       # GlusterFS backend
 %bcond_without rdma            # RDMA-based migration support
 %bcond_without ceph            # Ceph/RBD support
 %bcond_without glusterfs       # GlusterFS backend
 %bcond_without rdma            # RDMA-based migration support

-%bcond_with    xseg            # Archipelago backend [non-distributable: GPLv3+ vs GPLv2-only]
-%bcond_with    gtk2            # GTK+ 2.x instead of 3.x

 %bcond_without gtk3            # Do not build GTK+ UI
 %bcond_without vte             # VTE support in GTK+ UI
 %bcond_without spice           # SPICE support
 %bcond_without gtk3            # Do not build GTK+ UI
 %bcond_without vte             # VTE support in GTK+ UI
 %bcond_without spice           # SPICE support

-%bcond_with    esd             # EsounD audio support

 %bcond_without oss             # OSS audio support
 %bcond_without pulseaudio      # PulseAudio audio support
 %bcond_without xen             # Xen backend driver support
 %bcond_without oss             # OSS audio support
 %bcond_without pulseaudio      # PulseAudio audio support
 %bcond_without xen             # Xen backend driver support

-%bcond_without bluetooth       # bluetooth support

 %bcond_without brlapi          # brlapi support
 %bcond_without smartcard       # smartcard-nss support
 %bcond_without iscsi           # iscsi support
 %bcond_without libnfs          # NFS support
 %bcond_without brlapi          # brlapi support
 %bcond_without smartcard       # smartcard-nss support
 %bcond_without iscsi           # iscsi support
 %bcond_without libnfs          # NFS support

+%bcond_without multipath       # Multipath support
+%bcond_without pmem            # libpmem (persistent memory) support

 %bcond_without seccomp         # seccomp support
 %bcond_without usbredir        # usb network redirection support
 %bcond_without system_seabios  # system seabios binary
 %bcond_without snappy          # snappy compression library
 %bcond_without seccomp         # seccomp support
 %bcond_without usbredir        # usb network redirection support
 %bcond_without system_seabios  # system seabios binary
 %bcond_without snappy          # snappy compression library

-%bcond_with    lttng           # lttng-ust trace backend support
-%bcond_with    systemtap       # SystemTap/dtrace trace backend support
-
-%if %{with gtk2}
-%undefine with_gtk3
+%bcond_without user_static     # build linux-user static packages
+%bcond_with    lttng           # lttng-ust trace backend support [needs update]
+%bcond_without systemtap       # SystemTap/dtrace trace backend support
+%bcond_without virgl           # build virgl support
+%bcond_without xkbcommon       # xkbcommon support
+
+%if %{without gtk}
+%undefine      with_vte

 %endif
 %endif

-

 %ifarch x32
 %undefine      with_xen
 %endif
 %ifarch x32
 %undefine      with_xen
 %endif

+%ifnarch %{x8664} aarch64
+%undefine      with_pmem
+%endif

 
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
 
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu

-Version:       2.4.1
-Release:       1
-License:       GPL v2
+Version:       5.2.0
+Release:       6
+License:       GPL v2, BSD (edk2 firmware files)

 Group:         Applications/Emulators
 Group:         Applications/Emulators

-Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: a895e93ec1dafc34bc64ed676f0d55a6
-Source2:       %{name}.binfmt
+Source0:       https://download.qemu.org/%{name}-%{version}.tar.xz
+# Source0-md5: 179f86928835da857c237b42f4b2df73

 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm


@@ -56,129 +61,159 @@ Source9:  ksmtuned
 Source10:      ksmtuned.conf
 Source11:      %{name}-guest-agent.service
 Source12:      99-%{name}-guest-agent.rules
 Source10:      ksmtuned.conf
 Source11:      %{name}-guest-agent.service
 Source12:      99-%{name}-guest-agent.rules

+Source13:      %{name}-guest-agent.init
+Source14:      %{name}-guest-agent.logrotate
+Source15:      %{name}-pr-helper.service
+Source16:      %{name}-pr-helper.socket

 Patch0:                %{name}-cflags.patch
 Patch0:                %{name}-cflags.patch

-Patch1:                vgabios-widescreens.patch
-Patch2:                %{name}-whitelist.patch
-Patch3:                %{name}-system-libcacard.patch
-Patch4:                %{name}-xattr.patch
-Patch5:                libjpeg-boolean.patch
-Patch6:                x32.patch
-Patch7:                %{name}-sh.patch
-# Proof of concept, for reference, do not remove
-Patch400:      %{name}-kde_virtual_workspaces_hack.patch
-URL:           http://www.qemu-project.org/
-BuildRequires: OpenGL-devel
-BuildRequires: OpenGL-GLX-devel
+Patch1:                %{name}-user-execve.patch
+Patch2:                %{name}-xattr.patch
+Patch3:                libjpeg-boolean.patch
+Patch4:                x32.patch
+Patch5:                binutils-2.36.patch
+URL:           https://www.qemu.org/
+%{?with_opengl:BuildRequires:  Mesa-libgbm-devel}
+%{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
+%{?with_opengl:BuildRequires:  OpenGL-devel}

 %{?with_sdl:BuildRequires:     SDL2-devel >= 2.0}
 %{?with_sdl:BuildRequires:     SDL2-devel >= 2.0}

+%{?with_sdl:BuildRequires:     SDL2_image-devel >= 2.0}

 BuildRequires: alsa-lib-devel
 BuildRequires: alsa-lib-devel

-BuildRequires: bcc >= 0.16.21-2
-%{?with_bluetooth:BuildRequires:       bluez-libs-devel}

 %{?with_brlapi:BuildRequires:  brlapi-devel}
 BuildRequires: bzip2-devel
 %{?with_brlapi:BuildRequires:  brlapi-devel}
 BuildRequires: bzip2-devel

+BuildRequires: capstone-devel >= 3.0.5

 %{?with_ceph:BuildRequires:    ceph-devel}
 BuildRequires: curl-devel
 BuildRequires: cyrus-sasl-devel >= 2
 %{?with_ceph:BuildRequires:    ceph-devel}
 BuildRequires: curl-devel
 BuildRequires: cyrus-sasl-devel >= 2

-%{?with_esd:BuildRequires:     esound-devel}
-BuildRequires: glib2-devel >= 1:2.22
-%{?with_glusterfs:BuildRequires:       glusterfs-devel >= 3.4}
-BuildRequires: gnutls-devel > 2.10.0
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.48
+# minimal is 3.4 but new features are used up to 6
+%{?with_glusterfs:BuildRequires:       glusterfs-devel >= 6}
+BuildRequires: gnutls-devel >= 3.1.18
+%{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.22.0}

 BuildRequires: libaio-devel
 BuildRequires: libaio-devel

-%{?with_smartcard:BuildRequires:       libcacard-devel}
-BuildRequires: libcap-devel
+%{?with_smartcard:BuildRequires:       libcacard-devel >= 2.5.1}

 BuildRequires: libcap-ng-devel
 BuildRequires: libcap-ng-devel

-BuildRequires: libepoxy-devel
-BuildRequires: libfdt-devel
+BuildRequires: libdrm-devel
+%{?with_opengl:BuildRequires:  libepoxy-devel}
+BuildRequires: libfdt-devel >= 1.4.2

 %{?with_rdma:BuildRequires:    libibverbs-devel}
 %{?with_iscsi:BuildRequires:   libiscsi-devel >= 1.9.0}
 %{?with_rdma:BuildRequires:    libibverbs-devel}
 %{?with_iscsi:BuildRequires:   libiscsi-devel >= 1.9.0}

+%{?with_rdma:BuildRequires:    libibumad-devel}

 BuildRequires: libjpeg-devel
 %{?with_libnfs:BuildRequires:  libnfs-devel >= 1.9.3}
 BuildRequires: libpng-devel
 %{?with_rdma:BuildRequires:    librdmacm-devel}
 BuildRequires: libjpeg-devel
 %{?with_libnfs:BuildRequires:  libnfs-devel >= 1.9.3}
 BuildRequires: libpng-devel
 %{?with_rdma:BuildRequires:    librdmacm-devel}

-%{?with_seccomp:BuildRequires: libseccomp-devel >= 2.1.1}
-BuildRequires: libssh2-devel >= 1.2.8
-BuildRequires: libusb-devel >= 1.0.13
+%{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0}
+BuildRequires: libssh-devel >= 0.8
+BuildRequires: libslirp-devel >= 4.0.0
+# for tests only
+#BuildRequires:        libtasn1-devel
+BuildRequires: libusb-devel >= 1.0.22
+BuildRequires: liburing-devel

 BuildRequires: libuuid-devel
 BuildRequires: libuuid-devel

-%{?with_xseg:BuildRequires:    libxseg-devel}
+BuildRequires: libxml2-devel >= 2.0

 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 %{?with_lttng:BuildRequires:   lttng-ust-devel}

+BuildRequires: lzfse-devel

 BuildRequires: lzo-devel >= 2
 BuildRequires: lzo-devel >= 2

+BuildRequires: meson >= 0.55.0
+%{?with_multipath:BuildRequires:       multipath-tools-devel}

 BuildRequires: ncurses-devel
 BuildRequires: ncurses-devel

+# also libgcrypt-devel >= 1.5.0 possible, but gnutls already pulls nettle
+BuildRequires: nettle-devel >= 2.7.1
+BuildRequires: ninja

 %{?with_smartcard:BuildRequires:       nss-devel >= 1:3.12.8}
 BuildRequires: numactl-devel
 %{?with_smartcard:BuildRequires:       nss-devel >= 1:3.12.8}
 BuildRequires: numactl-devel

+BuildRequires: pam-devel

 BuildRequires: perl-Encode
 BuildRequires: perl-tools-pod
 BuildRequires: pixman-devel >= 0.21.8
 BuildRequires: pkgconfig
 BuildRequires: perl-Encode
 BuildRequires: perl-tools-pod
 BuildRequires: pixman-devel >= 0.21.8
 BuildRequires: pkgconfig

+%{?with_pmem:BuildRequires:    pmdk-devel}

 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel}
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel}

+BuildRequires: python3 >= 1:3.5

 BuildRequires: rpmbuild(macros) >= 1.644
 %{?with_system_seabios:BuildRequires:  seabios}
 BuildRequires: sed >= 4.0
 %{?with_snappy:BuildRequires:  snappy-devel}
 BuildRequires: rpmbuild(macros) >= 1.644
 %{?with_system_seabios:BuildRequires:  seabios}
 BuildRequires: sed >= 4.0
 %{?with_snappy:BuildRequires:  snappy-devel}

+BuildRequires: sphinx-pdg

 %if %{with spice}
 BuildRequires: spice-protocol >= 0.12.3
 %if %{with spice}
 BuildRequires: spice-protocol >= 0.12.3

-BuildRequires: spice-server-devel >= 0.12.0
+BuildRequires: spice-server-devel >= 0.12.5

 %endif
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 %endif
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}

+BuildRequires: tar >= 1:1.22

 BuildRequires: texi2html
 BuildRequires: texinfo
 BuildRequires: texi2html
 BuildRequires: texinfo

+%{?with_multipath:BuildRequires:       udev-devel}

 %{?with_usbredir:BuildRequires:        usbredir-devel >= 0.6}
 %{?with_lttng:BuildRequires:   userspace-rcu-devel}
 BuildRequires: vde2-devel
 BuildRequires: which
 %{?with_usbredir:BuildRequires:        usbredir-devel >= 0.6}
 %{?with_lttng:BuildRequires:   userspace-rcu-devel}
 BuildRequires: vde2-devel
 BuildRequires: which

-%{?with_xen:BuildRequires:     xen-devel >= 3.4}
+%{?with_virgl:BuildRequires:   virglrenderer-devel}
+%{?with_vte:BuildRequires:     vte-devel >= 0.32.0}
+# xencontrol xenstore xenguest xenforeignmemory xengnttab xenevtchn xendevicemodel; xentoolcore for xen 4.10+
+# min version is 4.2, more features up to 4.10
+%{?with_xen:BuildRequires:     xen-devel >= 4.10}

 BuildRequires: xfsprogs-devel
 BuildRequires: xfsprogs-devel

+%if %{with xkbcommon}
+BuildRequires: xkeyboard-config
+BuildRequires: xorg-lib-libxkbcommon-devel
+%endif

 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libX11-devel

+BuildRequires: xz

 BuildRequires: zlib-devel
 BuildRequires: zlib-devel

-%if %{with gtk2}
-BuildRequires: gtk+2-devel >= 2:2.18.0
-%{?with_vte:BuildRequires:     vte0-devel >= 0.24.0}
-%endif
-%if %{with gtk3}
-BuildRequires: gtk+3-devel >= 3.0.0
-%{?with_vte:BuildRequires:     vte2.90-devel >= 0.32.0}
+BuildRequires: zstd-devel >= 1.4.0
+%if %{with user_static}
+BuildRequires: glib2-static >= 1:2.48
+BuildRequires: glibc-static
+BuildRequires: pcre-static
+BuildRequires: zlib-static

 %endif
 Requires:      %{name}-img = %{version}-%{release}
 Requires:      %{name}-system-aarch64 = %{version}-%{release}
 Requires:      %{name}-system-alpha = %{version}-%{release}
 Requires:      %{name}-system-arm = %{version}-%{release}
 %endif
 Requires:      %{name}-img = %{version}-%{release}
 Requires:      %{name}-system-aarch64 = %{version}-%{release}
 Requires:      %{name}-system-alpha = %{version}-%{release}
 Requires:      %{name}-system-arm = %{version}-%{release}

+Requires:      %{name}-system-avr = %{version}-%{release}

 Requires:      %{name}-system-cris = %{version}-%{release}
 Requires:      %{name}-system-cris = %{version}-%{release}

-Requires:      %{name}-system-lm32 = %{version}-%{release}
+Requires:      %{name}-system-hppa = %{version}-%{release}

 Requires:      %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
 Requires:      %{name}-system-moxie = %{version}-%{release}
 Requires:      %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
 Requires:      %{name}-system-moxie = %{version}-%{release}

-Requires:      %{name}-system-or32 = %{version}-%{release}
+Requires:      %{name}-system-nios2 = %{version}-%{release}
+Requires:      %{name}-system-or1k = %{version}-%{release}

 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}

+Requires:      %{name}-system-riscv32 = %{version}-%{release}
+Requires:      %{name}-system-riscv64 = %{version}-%{release}
+Requires:      %{name}-system-rx = %{version}-%{release}

 Requires:      %{name}-system-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}
 Requires:      %{name}-system-sparc = %{version}-%{release}
 Requires:      %{name}-system-tricore = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}
 Requires:      %{name}-system-sparc = %{version}-%{release}
 Requires:      %{name}-system-tricore = %{version}-%{release}

-Requires:      %{name}-system-unicore32 = %{version}-%{release}

 Requires:      %{name}-system-x86 = %{version}-%{release}
 Requires:      %{name}-system-xtensa = %{version}-%{release}
 Requires:      %{name}-user = %{version}-%{release}
 Obsoletes:     qemu-kvm
 Requires:      %{name}-system-x86 = %{version}-%{release}
 Requires:      %{name}-system-xtensa = %{version}-%{release}
 Requires:      %{name}-user = %{version}-%{release}
 Obsoletes:     qemu-kvm

+ExcludeArch:   i386

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define        systempkg_req \
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define        systempkg_req \

-%if %{with sdl} \
-Requires:      SDL2 \
-%endif \
+Requires:      capstone >= 3.0.5 \
+%{?with_smartcard:Requires:    libcacard >= 2.5.1} \
+Requires:      libfdt >= 1.4.2 \

 %if %{with seccomp} \
 %if %{with seccomp} \

-Requires:      libseccomp >= 2.1.0 \
+Requires:      libseccomp >= 2.3.0 \

 %endif \
 %endif \

-Requires:      libusb >= 1.0.13 \
+Requires:      libslirp >= 4.0.0 \
+Requires:      libusb >= 1.0.22 \

 Requires:      pixman >= 0.21.8 \
 Requires:      pixman >= 0.21.8 \

+%if %{with spice} \
+Requires:      spice-server-libs >= 0.12.5 \
+%endif \

 %if %{with usbredir} \
 Requires:      usbredir >= 0.6 \
 %endif \
 %if %{with usbredir} \
 Requires:      usbredir >= 0.6 \
 %endif \

-%if %{with gtk2} \
-Requires:      gtk+2 >= 2:2.18.0 \
-%{?with_vte:Requires:  vte0 >= 0.24.0} \
-%endif \
-%if %{with gtk3} \
-Requires:      gtk+3 >= 3.0.0 \
-%{?with_vte:Requires:  vte2.90 >= 0.32.0} \
-%endif
+Requires:      zstd >= 1.4.0

 
 # don't strip/chrpath anything in there; these are boot images, roms etc
 %define                _noautostrip    .*%{_datadir}/qemu/.*
 
 # don't strip/chrpath anything in there; these are boot images, roms etc
 %define                _noautostrip    .*%{_datadir}/qemu/.*


@@ -218,7 +253,7 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy:
 %package common
 Summary:       QEMU common files needed by all QEMU targets
 Summary(pl.UTF-8):     Wspólne pliki QEMU wymagane przez wszystkie środowiska QEMU
 %package common
 Summary:       QEMU common files needed by all QEMU targets
 Summary(pl.UTF-8):     Wspólne pliki QEMU wymagane przez wszystkie środowiska QEMU

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires(post,preun,postun):   systemd-units >= 38
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun,postun):   systemd-units >= 38
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel


@@ -226,13 +261,16 @@ Requires(pre):    /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd

-Requires:      glib2 >= 1:2.22
-%{?with_libnfs:Requires:       libnfs >= 1.9.3}
-Requires:      libssh2 >= 1.2.8
+Requires:      glib2 >= 1:2.48
+Requires:      gnutls-libs >= 3.1.18
+%{?with_gtk3:Requires: gtk+3 >= 3.22.0}
+Requires:      nettle >= 2.7.1

 Requires:      systemd-units >= 38
 Requires:      systemd-units >= 38

+%{?with_vte:Requires:  vte >= 0.32.0}

 Provides:      group(qemu)
 Provides:      user(qemu)
 Obsoletes:     qemu-kvm-common
 Provides:      group(qemu)
 Provides:      user(qemu)
 Obsoletes:     qemu-kvm-common

+Obsoletes:     qemu-module-block-archipelago < 2.9.0

 Conflicts:     qemu < 1.0-2
 
 %description common
 Conflicts:     qemu < 1.0-2
 
 %description common


@@ -251,7 +289,7 @@ Ten pakiet udostępnia wspólne pliki wymagane przez wszystkie
 %package img
 Summary:       QEMU command line tool for manipulating disk images
 Summary(pl.UTF-8):     Narzędzie QEMU do operacji na obrazach dysków
 %package img
 Summary:       QEMU command line tool for manipulating disk images
 Summary(pl.UTF-8):     Narzędzie QEMU do operacji na obrazach dysków

-Group:         Development/Tools
+Group:         Applications/Emulators

 Obsoletes:     qemu-kvm-img
 Conflicts:     qemu < 1.0-2
 
 Obsoletes:     qemu-kvm-img
 Conflicts:     qemu < 1.0-2
 


@@ -266,7 +304,7 @@ na obrazach dysków.
 %package user
 Summary:       QEMU user mode emulation of qemu targets
 Summary(pl.UTF-8):     QEMU - emulacja trybu użytkownika środowisk qemu
 %package user
 Summary:       QEMU user mode emulation of qemu targets
 Summary(pl.UTF-8):     QEMU - emulacja trybu użytkownika środowisk qemu

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 Requires(post,postun): systemd-units >= 38
 Requires:      systemd-units >= 38
 Requires:      %{name}-common = %{version}-%{release}
 Requires(post,postun): systemd-units >= 38
 Requires:      systemd-units >= 38


@@ -284,10 +322,31 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet udostępnia emulację trybu użytkownika środowisk QEMU.
 
 
 Ten pakiet udostępnia emulację trybu użytkownika środowisk QEMU.
 

+%package user-static
+Summary:       QEMU user mode emulation of qemu targets static build
+Summary(pl.UTF-8):     QEMU - emulacja trybu użytkownika środowisk qemu - wersja statyczna
+Group:         Applications/Emulators
+Requires(post,postun): systemd-units >= 38
+Requires:      systemd-units >= 38
+
+%description user-static
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the user mode emulation of qemu targets built as
+static binaries.
+
+%description user-static -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet udostępnia emulację trybu użytkownika środowisk QEMU w
+oparciu o programy wykonywalne zbudowane statycznie.
+

 %package system-aarch64
 Summary:       QEMU system emulator for AArch64
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem AArch64
 %package system-aarch64
 Summary:       QEMU system emulator for AArch64
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem AArch64

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-aarch64
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-aarch64


@@ -296,18 +355,18 @@ Obsoletes:        qemu-kvm-system-aarch64
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 

-This package provides the system emulator with AArch64 CPU.
+This package provides the system emulator with AArch64 (ARM64) CPU.

 
 %description system-aarch64 -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 
 %description system-aarch64 -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 

-Ten pakiet zawiera emulator systemu z procesorem AArch64.
+Ten pakiet zawiera emulator systemu z procesorem AArch64 (ARM64).

 
 %package system-alpha
 Summary:       QEMU system emulator for Alpha
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Alpha
 
 %package system-alpha
 Summary:       QEMU system emulator for Alpha
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Alpha

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-alpha
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-alpha


@@ -325,9 +384,9 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 Ten pakiet zawiera emulator systemu z procesorem Alpha.
 
 %package system-arm
 Ten pakiet zawiera emulator systemu z procesorem Alpha.
 
 %package system-arm

-Summary:       QEMU system emulator for ARM
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem ARM
-Group:         Development/Tools
+Summary:       QEMU system emulator for 32-bit ARM
+Summary(pl.UTF-8):     QEMU - emulator systemu z 32-bitowym procesorem ARM
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-arm
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-arm


@@ -336,18 +395,38 @@ Obsoletes:        qemu-kvm-system-arm
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 

-This package provides the system emulator for ARM.
+This package provides the system emulator for 32-bit ARM.

 
 %description system-arm -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 
 %description system-arm -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 

-Ten pakiet zawiera emulator systemu z procesorem ARM.
+Ten pakiet zawiera emulator systemu z 32-bitowym procesorem ARM.
+
+%package system-avr
+Summary:       QEMU system emulator for AVR
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem AVR
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+Obsoletes:     qemu-kvm-system-avr
+
+%description system-avr
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator for AVR.
+
+%description system-avr -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem AVR.

 
 %package system-cris
 Summary:       QEMU system emulator for CRIS
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem CRIS
 
 %package system-cris
 Summary:       QEMU system emulator for CRIS
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem CRIS

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-cris
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-cris


@@ -364,30 +443,29 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem CRIS.
 
 
 Ten pakiet zawiera emulator systemu z procesorem CRIS.
 

-%package system-lm32
-Summary:       QEMU system emulator for LM32
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem LM32
-Group:         Development/Tools
+%package system-hppa
+Summary:       QEMU system emulator for HP/PA
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem HP/PA
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-lm32

 
 

-%description system-lm32
+%description system-hppa

 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 

-This package provides the system emulator with LM32 CPU.
+This package provides the system emulator with HP/PA (PA-RISC) CPU.

 
 

-%description system-lm32 -l pl.UTF-8
+%description system-hppa -l pl.UTF-8

 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 

-Ten pakiet zawiera emulator systemu z procesorem LM32.
+Ten pakiet zawiera emulator systemu z procesorem HP/PA (PA-RISC).

 
 %package system-m68k
 Summary:       QEMU system emulator for m68k
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem m68k
 
 %package system-m68k
 Summary:       QEMU system emulator for m68k
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem m68k

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-m68k
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-m68k


@@ -396,18 +474,20 @@ Obsoletes:        qemu-kvm-system-m68k
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 

-This package provides the system emulator with m68k CPU.
+This package provides the system emulator with m68k (Motorola 68xxx)
+CPU.

 
 %description system-m68k -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 
 %description system-m68k -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 

-Ten pakiet zawiera emulator systemu z procesorem m68k.
+Ten pakiet zawiera emulator systemu z procesorem m68k (Motorola
+68xxx).

 
 %package system-microblaze
 Summary:       QEMU system emulator for MicroBlaze
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem MicroBlaze
 
 %package system-microblaze
 Summary:       QEMU system emulator for MicroBlaze
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem MicroBlaze

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-microblaze
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-microblaze


@@ -427,7 +507,7 @@ Ten pakiet zawiera emulator systemu z procesorem MicroBlaze.
 %package system-mips
 Summary:       QEMU system emulator for MIPS
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem MIPS
 %package system-mips
 Summary:       QEMU system emulator for MIPS
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem MIPS

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-mips
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-mips


@@ -447,7 +527,7 @@ Ten pakiet zawiera emulator systemu z procesorem MIPS.
 %package system-moxie
 Summary:       QEMU system emulator for Moxie
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Moxie
 %package system-moxie
 Summary:       QEMU system emulator for Moxie
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Moxie

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 


@@ -463,21 +543,41 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem Moxie.
 
 
 Ten pakiet zawiera emulator systemu z procesorem Moxie.
 

-%package system-or32
+%package system-nios2
+Summary:       QEMU system emulator for Nios II
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Nios II
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-nios2
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator with Nios II CPU.
+
+%description system-nios2 -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem Nios II.
+
+%package system-or1k

 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-or32
+Obsoletes:     qemu-kvm-system-or1k
+Obsoletes:     qemu-system-or32

 
 

-%description system-or32
+%description system-or1k

 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 This package provides the system emulator with OpenRISC CPU.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 This package provides the system emulator with OpenRISC CPU.
 

-%description system-or32 -l pl.UTF-8
+%description system-or1k -l pl.UTF-8

 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 


@@ -486,7 +586,7 @@ Ten pakiet zawiera emulator systemu z procesorem OpenRISC.
 %package system-ppc
 Summary:       QEMU system emulator for PowerPC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem PowerPC
 %package system-ppc
 Summary:       QEMU system emulator for PowerPC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem PowerPC

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-ppc
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-ppc


@@ -503,10 +603,67 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem PowerPC.
 
 
 Ten pakiet zawiera emulator systemu z procesorem PowerPC.
 

+%package system-riscv32
+Summary:       QEMU system emulator for RISC-V (32 bit)
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem RISC-V (32 bit)
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-riscv32
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator with RISC-V (32 bit) CPU.
+
+%description system-riscv32 -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem RISC-V (32 bit).
+
+%package system-riscv64
+Summary:       QEMU system emulator for RISC-V (64 bit)
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem RISC-V (64 bitowym)
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-riscv64
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator with RISC-V (64 bit) CPU.
+
+%description system-riscv64 -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem RISC-V (64-bitowym).
+
+%package system-rx
+Summary:       QEMU system emulator for Renesas RX
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Renesas RX
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-rx
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator with Renesas RX CPU.
+
+%description system-rx -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem Renesas RX.
+

 %package system-s390x
 %package system-s390x

-Summary:       QEMU system emulator for S390
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem S390
-Group:         Development/Tools
+Summary:       QEMU system emulator for S390x (IBM Z)
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem S390x (IBM Z)
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-s390x
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-s390x


@@ -515,18 +672,18 @@ Obsoletes:        qemu-kvm-system-s390x
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 

-This package provides the system emulator with S390 CPU.
+This package provides the system emulator with S390x (IBM Z) CPU.

 
 %description system-s390x -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 
 %description system-s390x -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 

-Ten pakiet zawiera emulator systemu z procesorem S390.
+Ten pakiet zawiera emulator systemu z procesorem S390x (IBM Z).

 
 %package system-sh4
 Summary:       QEMU system emulator for SH4
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem SH4
 
 %package system-sh4
 Summary:       QEMU system emulator for SH4
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem SH4

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-sh4
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-sh4


@@ -546,7 +703,7 @@ Ten pakiet zawiera emulator systemu z procesorem SH4.
 %package system-sparc
 Summary:       QEMU system emulator for SPARC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem SPARC
 %package system-sparc
 Summary:       QEMU system emulator for SPARC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem SPARC

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-sparc
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-sparc


@@ -566,7 +723,7 @@ Ten pakiet zawiera emulator systemu z procesorem SPARC/SPARC64.
 %package system-tricore
 Summary:       QEMU system emulator for TriCore
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem TriCore
 %package system-tricore
 Summary:       QEMU system emulator for TriCore
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem TriCore

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 


@@ -576,36 +733,16 @@ good emulation speed by using dynamic translation.
 
 This package provides the system emulator with TriCore CPU.
 
 
 This package provides the system emulator with TriCore CPU.
 

-%description system-sparc -l pl.UTF-8
+%description system-tricore -l pl.UTF-8

 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem TriCore.
 
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem TriCore.
 

-%package system-unicore32
-Summary:       QEMU system emulator for UniCore32
-Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem UniCore32
-Group:         Development/Tools
-Requires:      %{name}-common = %{version}-%{release}
-%systempkg_req
-Obsoletes:     qemu-kvm-system-unicore32
-
-%description system-unicore32
-QEMU is a generic and open source processor emulator which achieves a
-good emulation speed by using dynamic translation.
-
-This package provides the system emulator with UniCore32 CPU.
-
-%description system-unicore32 -l pl.UTF-8
-QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
-dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
-
-Ten pakiet zawiera emulator systemu z procesorem UniCore32.
-

 %package system-x86
 Summary:       QEMU system emulator for x86
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem x86
 %package system-x86
 Summary:       QEMU system emulator for x86
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem x86

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %{?with_system_seabios:Requires:       seabios}
 %systempkg_req
 Requires:      %{name}-common = %{version}-%{release}
 %{?with_system_seabios:Requires:       seabios}
 %systempkg_req


@@ -616,14 +753,18 @@ Obsoletes:        qemu-kvm-system-x86
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 
 QEMU is a generic and open source processor emulator which achieves a
 good emulation speed by using dynamic translation.
 

+This package provides the system emulator with x86 CPU.
+

 %description system-x86 -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 %description system-x86 -l pl.UTF-8
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 

+Ten pakiet zawiera emulator systemu z procesorem x86.
+

 %package system-xtensa
 Summary:       QEMU system emulator for Xtensa
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Xtensa
 %package system-xtensa
 Summary:       QEMU system emulator for Xtensa
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Xtensa

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-xtensa
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Obsoletes:     qemu-kvm-system-xtensa


@@ -645,9 +786,10 @@ Summary:   QEMU guest agent
 Summary(pl.UTF-8):     Agent gościa QEMU
 Group:         Daemons
 Requires(post,preun,postun):   systemd-units >= 38
 Summary(pl.UTF-8):     Agent gościa QEMU
 Group:         Daemons
 Requires(post,preun,postun):   systemd-units >= 38

-Requires:      glib2 >= 1:2.22
+Requires:      glib2 >= 1:2.48

 Requires:      systemd-units >= 38
 Obsoletes:     qemu-kvm-guest-agent
 Requires:      systemd-units >= 38
 Obsoletes:     qemu-kvm-guest-agent

+Conflicts:     SysVinit < 2.96-2

 
 %description guest-agent
 QEMU is a generic and open source processor emulator which achieves a
 
 %description guest-agent
 QEMU is a generic and open source processor emulator which achieves a


@@ -669,170 +811,273 @@ systemach-gościach, komunikującego się kanałem virtio-serial o nazwie
 
 Ten pakiet nie musi być zainstalowany w systemie hosta.
 
 
 Ten pakiet nie musi być zainstalowany w systemie hosta.
 

-%package module-block-archipelago
-Summary:       QEMU module for Archipelago block devices
-Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych Archipelago
-Group:         Development/Tools
-Requires:      %{name}-common = %{version}-%{release}
-
-%description module-block-archipelago
-Archipelago block device support for QEMU.
-
-%description module-block-archipelago -l pl.UTF-8
-Moduł QEMU dla urządeń blokowych Archipelago.
-

 %package module-block-curl
 Summary:       QEMU module for 'curl' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'curl'
 %package module-block-curl
 Summary:       QEMU module for 'curl' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'curl'

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 
 %description module-block-curl
 Requires:      %{name}-common = %{version}-%{release}
 
 %description module-block-curl

-'curl' block device support for QEMU.
+QEMU block device support for CURL. It allows to access remote disks
+over http, https, ftp and other transports provided by the CURL
+library.

 
 %description module-block-curl -l pl.UTF-8
 
 %description module-block-curl -l pl.UTF-8

-Moduł QEMU dla urządeń blokowych typu 'curl'.
+Moduł QEMU dla urządeń blokowych CURL. Pozwala na dostęp do zdalnych
+dysków poprzez http, https, ftp i inne protokoły obsługiwane przez
+bibliotekę CURL.

 
 %package module-block-gluster
 Summary:       QEMU module for 'gluster' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'gluster'
 
 %package module-block-gluster
 Summary:       QEMU module for 'gluster' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'gluster'

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 Requires:      %{name}-common = %{version}-%{release}

-Requires:      glusterfs-libs >= 3.4
+Requires:      glusterfs-libs >= 6

 
 %description module-block-gluster
 
 %description module-block-gluster

-'gluster' block device support for QEMU.
+QEMU block device support for remote Gluster storage.

 
 %description module-block-gluster -l pl.UTF-8
 
 %description module-block-gluster -l pl.UTF-8

-Moduł QEMU dla urządeń blokowych typu 'gluster'.
+Moduł urządzeń blokowych QEMU do dostępu do zdalnej przestrzeni
+dyskowej Gluster.

 
 %package module-block-iscsi
 Summary:       QEMU module for 'iscsi' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'iscsi'
 
 %package module-block-iscsi
 Summary:       QEMU module for 'iscsi' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'iscsi'

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 Requires:      libiscsi >= 1.9.0
 
 %description module-block-iscsi
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      libiscsi >= 1.9.0
 
 %description module-block-iscsi

-'iscsi' block device support for QEMU.
+QEMU block device support for iSCSI volumes.

 
 %description module-block-iscsi -l pl.UTF-8
 
 %description module-block-iscsi -l pl.UTF-8

-Moduł QEMU dla urządeń blokowych typu 'iscsi'.
+Moduł urządzeń blokowych QEMU do dostępu do wolumenów iSCSI.
+
+%package module-block-nfs
+Summary:       QEMU module for 'nfs' block devices
+Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'nfs'
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+Requires:      libnfs >= 1.9.3
+
+%description module-block-nfs
+QEMU block device support for remote NFS storage.
+
+%description module-block-nfs -l pl.UTF-8
+Moduł urządzeń blokowych QEMU do dostępu do zdalnej przestrzeni po
+NFS.

 
 %package module-block-rbd
 Summary:       QEMU module for 'rbd' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'rbd'
 
 %package module-block-rbd
 Summary:       QEMU module for 'rbd' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'rbd'

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 
 %description module-block-rbd
 Requires:      %{name}-common = %{version}-%{release}
 
 %description module-block-rbd

-'rbd' block device support for QEMU.
+QEMU block device support for Ceph/RBD volumes.

 
 %description module-block-rbd -l pl.UTF-8
 
 %description module-block-rbd -l pl.UTF-8

-Moduł QEMU dla urządeń blokowych typu 'rbd'.
+Moduł urządzeń blokowych QEMU do wolumenów Ceph/RBD.

 
 %package module-block-ssh
 Summary:       QEMU module for 'ssh' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'ssh'
 
 %package module-block-ssh
 Summary:       QEMU module for 'ssh' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'ssh'

-Group:         Development/Tools
+Group:         Applications/Emulators

 Requires:      %{name}-common = %{version}-%{release}
 Requires:      %{name}-common = %{version}-%{release}

+Requires:      libssh >= 0.8

 
 %description module-block-ssh
 
 %description module-block-ssh

-'ssh' block device support for QEMU.
+QEMU block device support for accessing remote disks using the Secure
+Shell (SSH) protocol.

 
 %description module-block-ssh -l pl.UTF-8
 
 %description module-block-ssh -l pl.UTF-8

-Moduł QEMU dla urządeń blokowych typu 'ssh'.
+Moduł urządzeń blokowych QEMU do dostępu do zdalnych dysków poprzez
+protokół SSH (Secure Shell).
+
+%package module-ui-gtk
+Summary:       QEMU GTK UI driver
+Summary(pl.UTF-8):     Sterownik interfejsu użytkownika GTK dla QEMU
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+
+%description module-ui-gtk
+QEMU GTK UI driver.
+
+%description module-ui-gtk -l pl.UTF-8
+Sterownik interfejsu użytkownika GTK dla QEMU.
+
+%package module-ui-sdl
+Summary:       QEMU SDL UI and audio driver
+Summary(pl.UTF-8):     Sterownik interfejsu użytkownika i dźwięku SDL dla QEMU
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+
+%description module-ui-sdl
+QEMU SDL UI and audio driver.
+
+%description module-ui-sdl -l pl.UTF-8
+Sterownik interfejsu użytkownika i dźwięku SDL dla QEMU.
+
+%package -n systemtap-qemu
+Summary:       systemtap/dtrace probes for QEMU
+Summary(pl.UTF-8):     Sondy systemtap/dtrace dla QEMU
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+Requires:      systemtap-client
+
+%description -n systemtap-qemu
+systemtap/dtrace probes for QEMU.
+
+%description -n systemtap-qemu -l pl.UTF-8
+Sondy systemtap/dtrace dla QEMU.

 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1

-%patch2 -p0
+%patch2 -p1

 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

-%patch6 -p1
-%patch7 -p1

 
 

-%{__mv} libcacard libcacard-use-system-lib
-
-# workaround for conflict with alsa/error.h
-ln -s ../error.h qapi/error.h
+%{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap

 
 

+%if %{with systemtap}
+# don't require stap binary during build
+%{__sed} -i -e "s/has 'stap'/true/" configure
+%endif

 %build
 %build

-./configure \
-       --extra-cflags="%{rpmcflags} %{rpmcppflags} -fPIE -DPIE" \
-       --extra-ldflags="%{rpmldflags} -pie -Wl,-z,relro -Wl,-z,now" \
+
+build() {
+       local target=$1
+       shift
+
+       install -d build-$target
+       cd build-$target
+
+       ../configure \

        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
        --sysconfdir=%{_sysconfdir} \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --libexecdir=%{_libexecdir} \
        --sysconfdir=%{_sysconfdir} \

+       --localstatedir=%{_localstatedir} \
+       --interp-prefix=%{_libdir}/qemu/lib-%%M \

        --cc="%{__cc}" \
        --cc="%{__cc}" \

+       --cxx="%{__cxx}" \

        --host-cc="%{__cc}" \
        --disable-strip \
        --host-cc="%{__cc}" \
        --disable-strip \

-       %{__enable_disable xseg archipelago} \
+       --enable-trace-backends="nop%{?with_systemtap:,dtrace}%{?with_lttng:,ust}" \
+       --enable-kvm \
+       "$@"
+
+       %{__make} \
+               V=1 \
+               %{!?with_smartcard:CONFIG_USB_SMARTCARD=n}
+
+       cd ..
+}
+
+build dynamic \
+       --extra-cflags="%{rpmcflags} %{rpmcppflags}" \
+       --extra-ldflags="%{rpmldflags} -Wl,-z,relro -Wl,-z,now" \
+       --audio-drv-list="alsa%{?with_oss:,oss}%{?with_sdl:,sdl}%{?with_pulseaudio:,pa}" \

        --enable-attr \
        --enable-attr \

-       %{__enable_disable bluetooth bluez} \

        %{__enable_disable brlapi} \
        --enable-cap-ng \
        %{__enable_disable brlapi} \
        --enable-cap-ng \

+       --enable-capstone=system \

        --enable-curl \
        --enable-curses \
        --enable-docs \
        --enable-fdt \
        %{__enable_disable glusterfs} \
        --enable-curl \
        --enable-curses \
        --enable-docs \
        --enable-fdt \
        %{__enable_disable glusterfs} \

+       %{!?with_gtk3:--disable-gtk} \

        %{__enable_disable iscsi libiscsi} \
        %{__enable_disable iscsi libiscsi} \

+       %{__enable_disable libnfs} \
+       %{__enable_disable pmem libpmem} \
+       --enable-lzo \
+       %{__enable_disable multipath mpath} \
+       --enable-modules \
+       --disable-netmap \
+       --enable-nettle \

        %{__enable_disable ceph rbd} \
        %{__enable_disable rdma} \
        %{__enable_disable sdl} \
        %{__enable_disable ceph rbd} \
        %{__enable_disable rdma} \
        %{__enable_disable sdl} \

-       --with-sdlabi=2.0 \

        %{__enable_disable seccomp} \
        %{__enable_disable seccomp} \

+       --enable-slirp=system \

        %{__enable_disable spice} \
        %{__enable_disable spice} \

-       %{__enable_disable smartcard smartcard-nss} \
+       %{__enable_disable smartcard} \
+       %{__enable_disable snappy} \

        --enable-tpm \
        --enable-tpm \

-       --enable-trace-backends="nop%{?with_systemtap:,dtrace}%{?with_lttng:,ust}" \

        %{__enable_disable usbredir usb-redir} \
        %{__enable_disable usbredir usb-redir} \

-       --enable-uuid \

        --enable-vde \
        --enable-vde \

+       %{__enable_disable virgl virglrenderer} \

        --enable-virtfs \
        --enable-vnc-jpeg \
        --enable-vnc-png \
        --enable-vnc-sasl \
        --enable-virtfs \
        --enable-vnc-jpeg \
        --enable-vnc-png \
        --enable-vnc-sasl \

-       --enable-vnc-tls \

        %{!?with_vte:--disable-vte} \
        %{!?with_vte:--disable-vte} \

-       --enable-kvm \

        %{__enable_disable xen} \
        %{__enable_disable xen} \

-       --enable-modules \
-       --disable-netmap \
-       %{__enable_disable libnfs} \
-       --enable-lzo \
-       %{__enable_disable snappy} \
-       --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \
-       --interp-prefix=%{_libdir}/qemu/lib-%%M \
-%if %{without gtk2} && %{without gtk3}
-       --disable-gtk
-%else
-       --with-gtkabi="%{?with_gtk2:2.0}%{!?with_gtk2:3.0}"
+       %{__enable_disable xkbcommon}
+
+%if %{with user_static}
+build static \
+       --disable-brlapi \
+       --disable-cap-ng \
+       --disable-capstone \
+       --disable-curl \
+       --disable-curses \
+       --disable-gcrypt \
+       --disable-gnutls \
+       --disable-gtk \
+       --disable-guest-agent \
+       --disable-guest-agent-msi \
+       --disable-libnfs \
+       --disable-linux-io-uring \
+       --disable-mpath \
+       --disable-nettle \
+       --disable-pie \
+       --disable-sdl \
+       --disable-slirp \
+       --disable-spice \
+       --disable-system \
+       --disable-tcmalloc \
+       --disable-tools \
+       --enable-user \
+       --disable-xkbcommon \
+       --disable-zstd \
+       --static

 %endif
 
 %endif
 

-%{__make} \
-       V=1 \
-       %{!?with_smartcard:CONFIG_USB_SMARTCARD=n}
-
-# rebuild patched vesa tables with additional widescreen modes.
-%{__make} -C roms/vgabios stdvga-bios
-

 %{__cc} %{SOURCE7} %{rpmcflags} -o ksmctl
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{systemdunitdir},/usr/lib/binfmt.d} \
 %{__cc} %{SOURCE7} %{rpmcflags} -o ksmctl
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{systemdunitdir},/usr/lib/binfmt.d} \

-       $RPM_BUILD_ROOT/etc/{sysconfig,udev/rules.d,modules-load.d} \
-       $RPM_BUILD_ROOT{%{_sysconfdir}/sasl,%{_sbindir}}
+       $RPM_BUILD_ROOT/etc/{qemu,sysconfig,modules-load.d,rc.d/init.d,logrotate.d} \
+       $RPM_BUILD_ROOT{%{_sysconfdir}/sasl,/lib/udev/rules.d,%{_sbindir}}

 
 

-%{__make} install \
+%if %{with user_static}
+%{__make} -C build-static install \

        %{!?with_smartcard:CONFIG_USB_SMARTCARD=n} \
        DESTDIR=$RPM_BUILD_ROOT
 
        %{!?with_smartcard:CONFIG_USB_SMARTCARD=n} \
        DESTDIR=$RPM_BUILD_ROOT
 

+# Give all QEMU user emulators a -static suffix
+for src in $RPM_BUILD_ROOT%{_bindir}/qemu-*; do
+       %{__mv} $src $src-static
+done
+
+%endif
+
+%{__make} -C build-dynamic install \
+       %{!?with_smartcard:CONFIG_USB_SMARTCARD=n} \
+       DESTDIR=$RPM_BUILD_ROOT
+
+# let rpm generate dependencies
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/*.so
+
+echo "#allow br0" > $RPM_BUILD_ROOT/etc/qemu/bridge.conf
+

 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/qemu-ifup
 #!/bin/sh
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/qemu-ifup
 #!/bin/sh


@@ -842,9 +1087,8 @@ EOF
 install -p qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl/qemu.conf
 
 %ifarch %{ix86} %{x8664} x32
 install -p qemu.sasl $RPM_BUILD_ROOT%{_sysconfdir}/sasl/qemu.conf
 
 %ifarch %{ix86} %{x8664} x32

-install -p scripts/kvm/kvm_stat $RPM_BUILD_ROOT%{_bindir}

 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/modules-load.d/kvm.conf
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/modules-load.d/kvm.conf

-install -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -p %{SOURCE4} $RPM_BUILD_ROOT/lib/udev/rules.d

 %endif
 
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/ksm.service
 %endif
 
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/ksm.service


@@ -858,35 +1102,75 @@ install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
 # For the qemu-guest-agent subpackage install the systemd
 # service and udev rules.
 install -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}
 # For the qemu-guest-agent subpackage install the systemd
 # service and udev rules.
 install -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}

-install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -p %{SOURCE12} $RPM_BUILD_ROOT/lib/udev/rules.d
+
+install -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/qemu-ga
+install -p %{SOURCE14} $RPM_BUILD_ROOT/etc/logrotate.d/qemu-ga
+
+cp -p %{SOURCE15} %{SOURCE16} $RPM_BUILD_ROOT%{systemdunitdir}

 
 

-for i in dummy \
+# Install binfmt
+BINFMT_CPUS=" \

 %ifnarch %{ix86} %{x8664} x32
 %ifnarch %{ix86} %{x8664} x32

-       qemu-i386 \
+       i386 x86_64 \
+%endif
+%ifnarch aarch64
+       aarch64 \
+%endif
+%ifnarch alpha
+       alpha \
+%endif
+%ifnarch %{arm}
+       arm \

 %endif
 %endif

-%ifnarch arm
-       qemu-arm \
+       aarch64_be \
+       armeb \
+       microblaze microblazeel \
+%ifnarch mips64
+       mips64 \
+%ifnarch mips
+       mips \

 %endif
 %endif

-%ifnarch ppc ppc64
-       qemu-ppc \
+%endif
+%ifnarch mips64el
+       mips64el \
+%ifnarch mipsel
+       mipsel \
+%endif
+%endif
+%ifnarch m68k
+       m68k \
+%endif
+%ifnarch ppc ppc64 ppc64le
+       ppc ppc64 ppc64le \

 %endif
 %ifnarch sparc sparc64
 %endif
 %ifnarch sparc sparc64

-       qemu-sparc \
+       sparc sparc32plus sparc64 \
+%endif
+%ifnarch s390 s390x
+       s390x \

 %endif
 %ifnarch sh4
 %endif
 %ifnarch sh4

-       qemu-sh4 \
+       sh4 \

 %endif
 %endif

-; do
-       test $i = dummy && continue
-       grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i.conf
-done < %{SOURCE2}
-
-# packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qmp-commands.txt
-
-# install patched vesa tables with additional widescreen modes.
-cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin
+       sh4eb \
+"
+
+if [ -n "$BINFMT_CPUS" ]; then
+       for cpu in $BINFMT_CPUS; do
+               bash ./scripts/qemu-binfmt-conf.sh --systemd "$cpu" --exportdir $RPM_BUILD_ROOT/usr/lib/binfmt.d --qemu-path %{_bindir}
+       done
+       for i in $RPM_BUILD_ROOT/usr/lib/binfmt.d/*.conf; do
+               %{__mv} $i ${i%.conf}-dynamic.conf
+       done
+
+       %if %{with user_static}
+       for regularfmt in $RPM_BUILD_ROOT/usr/lib/binfmt.d/*; do
+               staticfmt="${regularfmt%\-dynamic.conf}-static.conf"
+               cat $regularfmt | tr -d '\n' | sed "s/:$/-static:F/" > $staticfmt
+       done
+       %endif
+fi

 
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin
 
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin


@@ -899,7 +1183,7 @@ for f in $RPM_BUILD_ROOT%{_datadir}/%{name}/*.aml ; do
 done
 %endif
 
 done
 %endif
 

-%if %{with gtk2} || %{with gtk3}
+%if %{with gtk3}

 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{de_DE,de}
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr}
 %find_lang %{name}
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{de_DE,de}
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr}
 %find_lang %{name}


@@ -907,6 +1191,18 @@ done
 : > qemu.lang
 %endif
 
 : > qemu.lang
 %endif
 

+for t in client server; do
+       cp -p build-dynamic/contrib/ivshmem-$t/ivshmem-$t $RPM_BUILD_ROOT%{_bindir}
+done
+
+# Windows installer icon, not used
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/qemu-nsis.bmp
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-licenses.txt
+
+# cleanup Sphinx files
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/{interop,specs,system,tools,user}/{.buildinfo,objects.inv}
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -934,17 +1230,30 @@ fi
 %triggerpostun common -- qemu-common < 1.6.1-4
 %systemd_trigger ksm.service
 %systemd_trigger ksmtuned.service
 %triggerpostun common -- qemu-common < 1.6.1-4
 %systemd_trigger ksm.service
 %systemd_trigger ksmtuned.service

+%systemd_trigger qemu-pr-helper.service

 
 %post user
 
 %post user

-%systemd_service_restart systemd-binfmt.service
+%systemd_post systemd-binfmt.service

 
 %postun user
 
 %postun user

-%systemd_service_restart systemd-binfmt.service
+%systemd_post systemd-binfmt.service
+
+%post user-static
+%systemd_post systemd-binfmt.service
+
+%postun user-static
+%systemd_post systemd-binfmt.service

 
 %post guest-agent
 
 %post guest-agent

+/sbin/chkconfig --add qemu-ga
+%service qemu-ga restart "qemu-ga"

 %systemd_reload
 
 %preun guest-agent
 %systemd_reload
 
 %preun guest-agent

+if [ "$1" = "0" ]; then
+       %service qemu-ga stop
+       /sbin/chkconfig --del qemu-ga
+fi

 %systemd_preun qemu-guest-agent.service
 
 %postun guest-agent
 %systemd_preun qemu-guest-agent.service
 
 %postun guest-agent


@@ -955,70 +1264,92 @@ fi
 
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files common -f %{name}.lang
 %defattr(644,root,root,755)

-%doc LICENSE README qemu-doc.html qemu-tech.html qmp-commands.txt
+%doc LICENSE README.rst pc-bios/edk2-licenses.txt

 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm

+%dir /etc/qemu
+%attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf

 %{systemdunitdir}/ksm.service
 %{systemdunitdir}/ksmtuned.service
 %{systemdunitdir}/ksm.service
 %{systemdunitdir}/ksmtuned.service

-%attr(755,root,root) %{_bindir}/virtfs-proxy-helper
+%{systemdunitdir}/qemu-pr-helper.service
+%{systemdunitdir}/qemu-pr-helper.socket
+%attr(755,root,root) %{_bindir}/elf2dmp
+%attr(755,root,root) %{_bindir}/ivshmem-client
+%attr(755,root,root) %{_bindir}/ivshmem-server
+%attr(755,root,root) %{_bindir}/qemu-edid
+%if %{with xkbcommon}
+%attr(755,root,root) %{_bindir}/qemu-keymap
+%endif

 %attr(755,root,root) %{_bindir}/qemu-nbd
 %attr(755,root,root) %{_bindir}/qemu-nbd

-%attr(755,root,root) %{_libdir}/qemu-bridge-helper
+%attr(755,root,root) %{_bindir}/qemu-pr-helper
+%attr(755,root,root) %{_bindir}/qemu-storage-daemon

 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned

+%attr(755,root,root) %{_libexecdir}/qemu-bridge-helper
+%if %{with virgl}
+%attr(755,root,root) %{_libexecdir}/vhost-user-gpu
+%endif
+%attr(755,root,root) %{_libexecdir}/virtfs-proxy-helper
+%attr(755,root,root) %{_libexecdir}/virtiofsd
+%dir %{_libdir}/%{name}
+# modules without too many external dependencies
+%attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so
+%attr(755,root,root) %{_libdir}/%{name}/block-dmg-lzfse.so
+%attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so
+%if %{with oss}
+%attr(755,root,root) %{_libdir}/%{name}/audio-oss.so
+%endif
+%if %{with pulseaudio}
+%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so
+%endif
+%if %{with brlapi}
+%attr(755,root,root) %{_libdir}/%{name}/chardev-baum.so
+%endif
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-qxl.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga.so
+%attr(755,root,root) %{_libdir}/%{name}/ui-curses.so
+%if %{with usbredir}
+%attr(755,root,root) %{_libdir}/%{name}/hw-usb-redirect.so
+%endif
+%if %{with smartcard}
+%attr(755,root,root) %{_libdir}/%{name}/hw-usb-smartcard.so
+%endif
+%if %{with opengl}
+%attr(755,root,root) %{_libdir}/%{name}/ui-egl-headless.so
+%attr(755,root,root) %{_libdir}/%{name}/ui-opengl.so
+%endif
+%if %{with spice}
+%attr(755,root,root) %{_libdir}/%{name}/audio-spice.so
+%attr(755,root,root) %{_libdir}/%{name}/chardev-spice.so
+%attr(755,root,root) %{_libdir}/%{name}/ui-spice-app.so
+%attr(755,root,root) %{_libdir}/%{name}/ui-spice-core.so
+%endif
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/firmware
+%{_datadir}/%{name}/keymaps
+%{_datadir}/%{name}/trace-events-all
+%dir %{_datadir}/%{name}/vhost-user
+%if %{with virgl}
+%{_datadir}/%{name}/vhost-user/50-qemu-gpu.json
+%endif
+%{_datadir}/%{name}/vhost-user/50-qemu-virtiofsd.json
+%{_desktopdir}/qemu.desktop
+%{_iconsdir}/hicolor/*x*/apps/qemu.png
+%{_iconsdir}/hicolor/32x32/apps/qemu.bmp
+%{_iconsdir}/hicolor/scalable/apps/qemu.svg

 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*

+%{_mandir}/man1/virtiofsd.1*
+%{_mandir}/man7/qemu-block-drivers.7*
+%{_mandir}/man7/qemu-cpu-models.7*
+%{_mandir}/man7/qemu-qmp-ref.7*

 %{_mandir}/man8/qemu-nbd.8*
 %{_mandir}/man8/qemu-nbd.8*

-
-%dir %{_datadir}/qemu
-%{_datadir}/%{name}/keymaps
-%{_datadir}/%{name}/qemu-icon.bmp
-%{_datadir}/%{name}/trace-events
-
-# various bios images
-# all should be probably moved to the right system subpackage
-%{_datadir}/%{name}/QEMU,cgthree.bin
-%{_datadir}/%{name}/QEMU,tcx.bin
-%{_datadir}/%{name}/bamboo.dtb
-%{_datadir}/%{name}/efi-e1000.rom
-%{_datadir}/%{name}/efi-eepro100.rom
-%{_datadir}/%{name}/efi-ne2k_pci.rom
-%{_datadir}/%{name}/efi-pcnet.rom
-%{_datadir}/%{name}/efi-rtl8139.rom
-%{_datadir}/%{name}/efi-virtio.rom
-%{_datadir}/%{name}/kvmvapic.bin
-%{_datadir}/%{name}/linuxboot.bin
-%{_datadir}/%{name}/multiboot.bin
-%{_datadir}/%{name}/openbios-ppc
-%{_datadir}/%{name}/openbios-sparc*
-%{_datadir}/%{name}/palcode-clipper
-%{_datadir}/%{name}/petalogix-ml605.dtb
-%{_datadir}/%{name}/petalogix-s3adsp1800.dtb
-%{_datadir}/%{name}/ppc_rom.bin
-%{_datadir}/%{name}/pxe-e1000.rom
-%{_datadir}/%{name}/pxe-eepro100.rom
-%{_datadir}/%{name}/pxe-ne2k_pci.rom
-%{_datadir}/%{name}/pxe-pcnet.rom
-%{_datadir}/%{name}/pxe-rtl8139.rom
-%{_datadir}/%{name}/pxe-virtio.rom
-%{_datadir}/%{name}/qemu_logo_no_text.svg
-%{_datadir}/%{name}/s390-ccw.img
-%{_datadir}/%{name}/s390-zipl.rom
-%{_datadir}/%{name}/sgabios.bin
-%{_datadir}/%{name}/slof.bin
-%{_datadir}/%{name}/spapr-rtas.bin
-%{_datadir}/%{name}/vgabios-cirrus.bin
-%{_datadir}/%{name}/vgabios-qxl.bin
-%{_datadir}/%{name}/vgabios-stdvga.bin
-%{_datadir}/%{name}/vgabios-virtio.bin
-%{_datadir}/%{name}/vgabios-vmware.bin
-%{_datadir}/%{name}/vgabios.bin
-
-%dir %{_libdir}/%{name}
-
-# modules without too many external dependencies
-%attr(755,root,root) %{_libdir}/%{name}/block-dmg.so
+%{_mandir}/man8/qemu-pr-helper.8*
+%{_docdir}/qemu

 
 %files img
 %defattr(644,root,root,755)
 
 %files img
 %defattr(644,root,root,755)


@@ -1027,12 +1358,14 @@ fi
 
 %files user
 %defattr(644,root,root,755)
 
 %files user
 %defattr(644,root,root,755)

-/usr/lib/binfmt.d/qemu-*.conf
+/usr/lib/binfmt.d/qemu-*-dynamic.conf

 %attr(755,root,root) %{_bindir}/qemu-aarch64
 %attr(755,root,root) %{_bindir}/qemu-aarch64

+%attr(755,root,root) %{_bindir}/qemu-aarch64_be

 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
 %attr(755,root,root) %{_bindir}/qemu-cris
 %attr(755,root,root) %{_bindir}/qemu-alpha
 %attr(755,root,root) %{_bindir}/qemu-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
 %attr(755,root,root) %{_bindir}/qemu-cris

+%attr(755,root,root) %{_bindir}/qemu-hppa

 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io
 %attr(755,root,root) %{_bindir}/qemu-m68k
 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io
 %attr(755,root,root) %{_bindir}/qemu-m68k


@@ -1044,39 +1377,94 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el
 %attr(755,root,root) %{_bindir}/qemu-mips64el
 %attr(755,root,root) %{_bindir}/qemu-mipsn32
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el

-%attr(755,root,root) %{_bindir}/qemu-or32
+%attr(755,root,root) %{_bindir}/qemu-nios2
+%attr(755,root,root) %{_bindir}/qemu-or1k

 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64

-%attr(755,root,root) %{_bindir}/qemu-ppc64abi32

 %attr(755,root,root) %{_bindir}/qemu-ppc64le
 %attr(755,root,root) %{_bindir}/qemu-ppc64le

+%attr(755,root,root) %{_bindir}/qemu-riscv32
+%attr(755,root,root) %{_bindir}/qemu-riscv64

 %attr(755,root,root) %{_bindir}/qemu-s390x
 %attr(755,root,root) %{_bindir}/qemu-sh4
 %attr(755,root,root) %{_bindir}/qemu-sh4eb
 %attr(755,root,root) %{_bindir}/qemu-sparc
 %attr(755,root,root) %{_bindir}/qemu-sparc32plus
 %attr(755,root,root) %{_bindir}/qemu-sparc64
 %attr(755,root,root) %{_bindir}/qemu-s390x
 %attr(755,root,root) %{_bindir}/qemu-sh4
 %attr(755,root,root) %{_bindir}/qemu-sh4eb
 %attr(755,root,root) %{_bindir}/qemu-sparc
 %attr(755,root,root) %{_bindir}/qemu-sparc32plus
 %attr(755,root,root) %{_bindir}/qemu-sparc64

-%attr(755,root,root) %{_bindir}/qemu-unicore32

 %attr(755,root,root) %{_bindir}/qemu-x86_64
 %attr(755,root,root) %{_bindir}/qemu-x86_64

+%attr(755,root,root) %{_bindir}/qemu-xtensa
+%attr(755,root,root) %{_bindir}/qemu-xtensaeb
+
+%if %{with user_static}
+%files user-static
+%defattr(644,root,root,755)
+/usr/lib/binfmt.d/qemu-*-static.conf
+%attr(755,root,root) %{_bindir}/qemu-aarch64-static
+%attr(755,root,root) %{_bindir}/qemu-aarch64_be-static
+%attr(755,root,root) %{_bindir}/qemu-alpha-static
+%attr(755,root,root) %{_bindir}/qemu-arm-static
+%attr(755,root,root) %{_bindir}/qemu-armeb-static
+%attr(755,root,root) %{_bindir}/qemu-cris-static
+%attr(755,root,root) %{_bindir}/qemu-hppa-static
+%attr(755,root,root) %{_bindir}/qemu-i386-static
+%attr(755,root,root) %{_bindir}/qemu-m68k-static
+%attr(755,root,root) %{_bindir}/qemu-microblaze-static
+%attr(755,root,root) %{_bindir}/qemu-microblazeel-static
+%attr(755,root,root) %{_bindir}/qemu-mips-static
+%attr(755,root,root) %{_bindir}/qemu-mips64-static
+%attr(755,root,root) %{_bindir}/qemu-mips64el-static
+%attr(755,root,root) %{_bindir}/qemu-mipsel-static
+%attr(755,root,root) %{_bindir}/qemu-mipsn32-static
+%attr(755,root,root) %{_bindir}/qemu-mipsn32el-static
+%attr(755,root,root) %{_bindir}/qemu-nios2-static
+%attr(755,root,root) %{_bindir}/qemu-or1k-static
+%attr(755,root,root) %{_bindir}/qemu-ppc-static
+%attr(755,root,root) %{_bindir}/qemu-ppc64-static
+%attr(755,root,root) %{_bindir}/qemu-ppc64le-static
+%attr(755,root,root) %{_bindir}/qemu-riscv32-static
+%attr(755,root,root) %{_bindir}/qemu-riscv64-static
+%attr(755,root,root) %{_bindir}/qemu-s390x-static
+%attr(755,root,root) %{_bindir}/qemu-sh4-static
+%attr(755,root,root) %{_bindir}/qemu-sh4eb-static
+%attr(755,root,root) %{_bindir}/qemu-sparc-static
+%attr(755,root,root) %{_bindir}/qemu-sparc32plus-static
+%attr(755,root,root) %{_bindir}/qemu-sparc64-static
+%attr(755,root,root) %{_bindir}/qemu-x86_64-static
+%attr(755,root,root) %{_bindir}/qemu-xtensa-static
+%attr(755,root,root) %{_bindir}/qemu-xtensaeb-static
+%{?with_systemtap:%attr(755,root,root) %{_bindir}/qemu-trace-stap-static}
+%endif

 
 %files system-aarch64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-aarch64
 
 %files system-aarch64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-aarch64

+%{_datadir}/%{name}/edk2-aarch64-code.fd
+%{_datadir}/%{name}/firmware/60-edk2-aarch64.json

 
 %files system-alpha
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-alpha
 
 %files system-alpha
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-alpha

+%{_datadir}/%{name}/palcode-clipper

 
 %files system-arm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-arm
 
 %files system-arm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-arm

+%{_datadir}/%{name}/edk2-arm-code.fd
+%{_datadir}/%{name}/edk2-arm-vars.fd
+%{_datadir}/%{name}/firmware/60-edk2-arm.json
+%{_datadir}/%{name}/npcm7xx_bootrom.bin
+
+%files system-avr
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-avr

 
 %files system-cris
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-cris
 
 
 %files system-cris
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-cris
 

-%files system-lm32
+%files system-hppa

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_bindir}/qemu-system-lm32
+%attr(755,root,root) %{_bindir}/qemu-system-hppa
+%{_datadir}/%{name}/hppa-firmware.img

 
 %files system-m68k
 %defattr(644,root,root,755)
 
 %files system-m68k
 %defattr(644,root,root,755)


@@ -1098,21 +1486,50 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-moxie
 
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-moxie
 

-%files system-or32
+%files system-nios2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-nios2
+
+%files system-or1k

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_bindir}/qemu-system-or32
+%attr(755,root,root) %{_bindir}/qemu-system-or1k

 
 %files system-ppc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-ppc
 %attr(755,root,root) %{_bindir}/qemu-system-ppc64
 
 %files system-ppc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-ppc
 %attr(755,root,root) %{_bindir}/qemu-system-ppc64

-#%attr(755,root,root) %{_bindir}/qemu-system-ppc64le
-%attr(755,root,root) %{_bindir}/qemu-system-ppcemb
+%{_datadir}/%{name}/bamboo.dtb
+%{_datadir}/%{name}/canyonlands.dtb
+%{_datadir}/%{name}/openbios-ppc
+%{_datadir}/%{name}/petalogix-ml605.dtb
+%{_datadir}/%{name}/petalogix-s3adsp1800.dtb
+%{_datadir}/%{name}/qemu_vga.ndrv
+%{_datadir}/%{name}/skiboot.lid
+%{_datadir}/%{name}/slof.bin

 %{_datadir}/%{name}/u-boot.e500
 %{_datadir}/%{name}/u-boot.e500

+%{_datadir}/%{name}/u-boot-sam460-20100605.bin
+
+%files system-riscv32
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-riscv32
+%{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.bin
+%{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.elf
+
+%files system-riscv64
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-riscv64
+%{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.bin
+%{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.elf
+
+%files system-rx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-rx

 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x

+%{_datadir}/%{name}/s390-ccw.img
+%{_datadir}/%{name}/s390-netboot.img

 
 %files system-sh4
 %defattr(644,root,root,755)
 
 %files system-sh4
 %defattr(644,root,root,755)


@@ -1123,28 +1540,65 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-sparc
 %attr(755,root,root) %{_bindir}/qemu-system-sparc64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-sparc
 %attr(755,root,root) %{_bindir}/qemu-system-sparc64

+%{_datadir}/%{name}/QEMU,cgthree.bin
+%{_datadir}/%{name}/QEMU,tcx.bin
+%{_datadir}/%{name}/openbios-sparc32
+%{_datadir}/%{name}/openbios-sparc64

 
 %files system-tricore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-tricore
 
 
 %files system-tricore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-tricore
 

-%files system-unicore32
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qemu-system-unicore32
-

 %files system-x86
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-i386
 %attr(755,root,root) %{_bindir}/qemu-system-x86_64
 %ifarch %{ix86} %{x8664} x32
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/kvm.conf
 %files system-x86
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-i386
 %attr(755,root,root) %{_bindir}/qemu-system-x86_64
 %ifarch %{ix86} %{x8664} x32
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/kvm.conf

-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/80-kvm.rules
-%attr(755,root,root) %{_bindir}/kvm_stat
+/lib/udev/rules.d/80-kvm.rules

 %endif
 %{_datadir}/%{name}/bios.bin
 %{_datadir}/%{name}/bios-256k.bin
 %endif
 %{_datadir}/%{name}/bios.bin
 %{_datadir}/%{name}/bios-256k.bin

-%{_datadir}/%{name}/acpi-dsdt.aml
-%{_datadir}/%{name}/q35-acpi-dsdt.aml
+%{_datadir}/%{name}/bios-microvm.bin
+%{_datadir}/%{name}/edk2-i386-code.fd
+%{_datadir}/%{name}/edk2-i386-secure-code.fd
+%{_datadir}/%{name}/edk2-i386-vars.fd
+%{_datadir}/%{name}/edk2-x86_64-code.fd
+%{_datadir}/%{name}/edk2-x86_64-secure-code.fd
+%{_datadir}/%{name}/efi-e1000e.rom
+%{_datadir}/%{name}/efi-e1000.rom
+%{_datadir}/%{name}/efi-eepro100.rom
+%{_datadir}/%{name}/efi-ne2k_pci.rom
+%{_datadir}/%{name}/efi-pcnet.rom
+%{_datadir}/%{name}/efi-rtl8139.rom
+%{_datadir}/%{name}/efi-virtio.rom
+%{_datadir}/%{name}/efi-vmxnet3.rom
+%{_datadir}/%{name}/kvmvapic.bin
+%{_datadir}/%{name}/linuxboot.bin
+%{_datadir}/%{name}/linuxboot_dma.bin
+%{_datadir}/%{name}/multiboot.bin
+%{_datadir}/%{name}/pvh.bin
+%{_datadir}/%{name}/pxe-e1000.rom
+%{_datadir}/%{name}/pxe-eepro100.rom
+%{_datadir}/%{name}/pxe-ne2k_pci.rom
+%{_datadir}/%{name}/pxe-pcnet.rom
+%{_datadir}/%{name}/pxe-rtl8139.rom
+%{_datadir}/%{name}/pxe-virtio.rom
+%{_datadir}/%{name}/qboot.rom
+%{_datadir}/%{name}/sgabios.bin
+%{_datadir}/%{name}/vgabios.bin
+%{_datadir}/%{name}/vgabios-ati.bin
+%{_datadir}/%{name}/vgabios-bochs-display.bin
+%{_datadir}/%{name}/vgabios-cirrus.bin
+%{_datadir}/%{name}/vgabios-qxl.bin
+%{_datadir}/%{name}/vgabios-ramfb.bin
+%{_datadir}/%{name}/vgabios-stdvga.bin
+%{_datadir}/%{name}/vgabios-virtio.bin
+%{_datadir}/%{name}/vgabios-vmware.bin
+%{_datadir}/%{name}/firmware/50-edk2-i386-secure.json
+%{_datadir}/%{name}/firmware/50-edk2-x86_64-secure.json
+%{_datadir}/%{name}/firmware/60-edk2-i386.json
+%{_datadir}/%{name}/firmware/60-edk2-x86_64.json

 
 %files system-xtensa
 %defattr(644,root,root,755)
 
 %files system-xtensa
 %defattr(644,root,root,755)


@@ -1153,15 +1607,13 @@ fi
 
 %files guest-agent
 %defattr(644,root,root,755)
 
 %files guest-agent
 %defattr(644,root,root,755)

-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/99-qemu-guest-agent.rules
-%{systemdunitdir}/qemu-guest-agent.service

 %attr(755,root,root) %{_bindir}/qemu-ga
 %attr(755,root,root) %{_bindir}/qemu-ga

-
-%if %{with xseg}
-%files module-block-archipelago
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/block-archipelago.so
-%endif
+/lib/udev/rules.d/99-qemu-guest-agent.rules
+%{systemdunitdir}/qemu-guest-agent.service
+%attr(754,root,root) /etc/rc.d/init.d/qemu-ga
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/qemu-ga
+%{_mandir}/man7/qemu-ga-ref.7*
+%{_mandir}/man8/qemu-ga.8*

 
 %files module-block-curl
 %defattr(644,root,root,755)
 
 %files module-block-curl
 %defattr(644,root,root,755)


@@ -1179,6 +1631,12 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/block-iscsi.so
 %endif
 
 %attr(755,root,root) %{_libdir}/%{name}/block-iscsi.so
 %endif
 

+%if %{with libnfs}
+%files module-block-nfs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so
+%endif
+

 %if %{with ceph}
 %files module-block-rbd
 %defattr(644,root,root,755)
 %if %{with ceph}
 %files module-block-rbd
 %defattr(644,root,root,755)


@@ -1188,3 +1646,24 @@ fi
 %files module-block-ssh
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-ssh.so
 %files module-block-ssh
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-ssh.so

+
+%if %{with gtk3}
+%files module-ui-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/ui-gtk.so
+%endif
+
+%if %{with sdl}
+%files module-ui-sdl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so
+%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so
+%endif
+
+%if %{with systemtap}
+%files -n systemtap-qemu
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-trace-stap
+%{_datadir}/systemtap/tapset/qemu-*.stp
+%{_mandir}/man1/qemu-trace-stap.1*
+%endif