- cleanup

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index 5cde328ee52fd15673e235d5ab946fc22b7ac108..96ce968adf7f679e5e1cdb6404d9319633ba1fbd 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -5,8 +5,6 @@
 %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


@@ -26,10 +24,8 @@
 %bcond_without user_static     # build linux-user static packages
 %bcond_with    lttng           # lttng-ust trace backend support
 %bcond_with    systemtap       # SystemTap/dtrace trace backend support
 %bcond_without user_static     # build linux-user static packages
 %bcond_with    lttng           # lttng-ust trace backend support
 %bcond_with    systemtap       # SystemTap/dtrace trace backend support

-
-%if %{with gtk2}
-%undefine with_gtk3
-%endif
+%bcond_with    virgl           # build virgl support
+%bcond_without xkbcommon       # xkbcommon support

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


@@ -38,12 +34,12 @@
 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.8.0
+Version:       3.1.0

 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators

-Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 17940dce063b6ce450a12e719a6c9c43
+Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz
+# Source0-md5: fb687ce0b02d3bf4327e36d3b99427a8

 # 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


@@ -53,14 +49,12 @@ Source6:    ksm.sysconfig
 Source7:       ksmctl.c
 Source9:       ksmtuned
 Source10:      ksmtuned.conf
 Source7:       ksmctl.c
 Source9:       ksmtuned
 Source10:      ksmtuned.conf

-Source12:      99-%{name}-guest-agent.rules

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

-Patch1:                vgabios-widescreens.patch
-Patch2:                %{name}-whitelist.patch
-Patch3:                %{name}-user-execve.patch
-Patch4:                %{name}-xattr.patch
-Patch5:                libjpeg-boolean.patch
-Patch6:                x32.patch
+Patch1:                %{name}-whitelist.patch
+Patch2:                %{name}-user-execve.patch
+Patch3:                %{name}-xattr.patch
+Patch4:                libjpeg-boolean.patch
+Patch5:                x32.patch

 URL:           http://www.qemu-project.org/
 %{?with_gl:BuildRequires:      OpenGL-GLX-devel}
 %{?with_gl:BuildRequires:      OpenGL-devel}
 URL:           http://www.qemu-project.org/
 %{?with_gl:BuildRequires:      OpenGL-GLX-devel}
 %{?with_gl:BuildRequires:      OpenGL-devel}


@@ -76,24 +70,24 @@ BuildRequires:      cyrus-sasl-devel >= 2
 %{?with_esd:BuildRequires:     esound-devel}
 BuildRequires: glib2-devel >= 1:2.22
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 3.4}
 %{?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: gnutls-devel >= 3.1.18

 BuildRequires: libaio-devel
 %{?with_smartcard:BuildRequires:       libcacard-devel}
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 %{?with_gl:BuildRequires:      libepoxy-devel}
 BuildRequires: libaio-devel
 %{?with_smartcard:BuildRequires:       libcacard-devel}
 BuildRequires: libcap-devel
 BuildRequires: libcap-ng-devel
 %{?with_gl:BuildRequires:      libepoxy-devel}

-BuildRequires: libfdt-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}
+%{?with_seccomp:BuildRequires: libseccomp-devel >= 2.2.0}

 BuildRequires: libssh2-devel >= 1.2.8
 BuildRequires: libusb-devel >= 1.0.13
 BuildRequires: libuuid-devel
 BuildRequires: libssh2-devel >= 1.2.8
 BuildRequires: libusb-devel >= 1.0.13
 BuildRequires: libuuid-devel

-%{?with_xseg:BuildRequires:    libxseg-devel}

 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzo-devel >= 2
 BuildRequires: ncurses-devel
 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzo-devel >= 2
 BuildRequires: ncurses-devel


@@ -119,16 +113,14 @@ BuildRequires:    texinfo
 %{?with_lttng:BuildRequires:   userspace-rcu-devel}
 BuildRequires: vde2-devel
 BuildRequires: which
 %{?with_lttng:BuildRequires:   userspace-rcu-devel}
 BuildRequires: vde2-devel
 BuildRequires: which

+%{?with_virgl:BuildRequires:   virglrenderer-devel}

 %{?with_xen:BuildRequires:     xen-devel >= 3.4}
 BuildRequires: xfsprogs-devel
 %{?with_xen:BuildRequires:     xen-devel >= 3.4}
 BuildRequires: xfsprogs-devel

+%{?with_xkbcommon:BuildRequires:       xorg-lib-libxkbcommon-devel}

 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
 BuildRequires: xorg-lib-libX11-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}
 %if %{with gtk3}

-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.14.0

 %{?with_vte:BuildRequires:     vte2.90-devel >= 0.32.0}
 %endif
 %if %{with user_static}
 %{?with_vte:BuildRequires:     vte2.90-devel >= 0.32.0}
 %endif
 %if %{with user_static}


@@ -142,13 +134,17 @@ Requires: %{name}-system-aarch64 = %{version}-%{release}
 Requires:      %{name}-system-alpha = %{version}-%{release}
 Requires:      %{name}-system-arm = %{version}-%{release}
 Requires:      %{name}-system-cris = %{version}-%{release}
 Requires:      %{name}-system-alpha = %{version}-%{release}
 Requires:      %{name}-system-arm = %{version}-%{release}
 Requires:      %{name}-system-cris = %{version}-%{release}

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

 Requires:      %{name}-system-lm32 = %{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-lm32 = %{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-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}
 Requires:      %{name}-system-sparc = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
 Requires:      %{name}-system-sh4 = %{version}-%{release}
 Requires:      %{name}-system-sparc = %{version}-%{release}


@@ -164,20 +160,17 @@ BuildRoot:        %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %if %{with sdl} \
 Requires:      SDL2 \
 %endif \
 %if %{with sdl} \
 Requires:      SDL2 \
 %endif \

+Requires:      libfdt >= 1.4.2 \

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

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

 %endif \
 Requires:      libusb >= 1.0.13 \
 Requires:      pixman >= 0.21.8 \
 %if %{with usbredir} \
 Requires:      usbredir >= 0.6 \
 %endif \
 %endif \
 Requires:      libusb >= 1.0.13 \
 Requires:      pixman >= 0.21.8 \
 %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} \
 %if %{with gtk3} \

-Requires:      gtk+3 >= 3.0.0 \
+Requires:      gtk+3 >= 3.14.0 \

 %{?with_vte:Requires:  vte2.90 >= 0.32.0} \
 %endif
 
 %{?with_vte:Requires:  vte2.90 >= 0.32.0} \
 %endif
 


@@ -227,6 +220,7 @@ Requires(pre):      /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      glib2 >= 1:2.22
 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
 Provides:      group(qemu)
 Provides:      user(qemu)
 Requires:      libssh2 >= 1.2.8
 Provides:      group(qemu)
 Provides:      user(qemu)


@@ -384,6 +378,25 @@ 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-hppa
+Summary:       QEMU system emulator for HP/PA
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem HP/PA
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-hppa
+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 HP/PA CPU.
+
+%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.
+
+Ten pakiet zawiera emulator systemu z procesorem HP/PA.
+

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


@@ -483,21 +496,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:         Development/Tools
+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
 Group:         Development/Tools
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
 Group:         Development/Tools
 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.
 


@@ -523,6 +556,44 @@ 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:         Development/Tools
+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 bit)
+Group:         Development/Tools
+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 bit).
+

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


@@ -687,18 +758,6 @@ 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'


@@ -711,19 +770,6 @@ Requires:  %{name}-common = %{version}-%{release}
 %description module-block-curl -l pl.UTF-8
 Moduł QEMU dla urządeń blokowych typu 'curl'.
 
 %description module-block-curl -l pl.UTF-8
 Moduł QEMU dla urządeń blokowych typu 'curl'.
 

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

 %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'


@@ -750,19 +796,6 @@ Requires:  libiscsi >= 1.9.0
 %description module-block-iscsi -l pl.UTF-8
 Moduł QEMU dla urządeń blokowych typu 'iscsi'.
 
 %description module-block-iscsi -l pl.UTF-8
 Moduł QEMU dla urządeń blokowych typu '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:         Development/Tools
-Requires:      %{name}-common = %{version}-%{release}
-Requires:      libnfs >= 1.9.3
-
-%description module-block-nfs
-'nfs' block device support for QEMU.
-
-%description module-block-nfs -l pl.UTF-8
-Moduł QEMU dla urządeń blokowych typu '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'


@@ -795,7 +828,6 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

-%patch6 -p1

 
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h
 
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h


@@ -833,7 +865,6 @@ build() {
 build dynamic \
        --extra-cflags="%{rpmcflags} %{rpmcppflags} -fPIE -DPIE" \
        --extra-ldflags="%{rpmldflags} -pie -Wl,-z,relro -Wl,-z,now" \
 build dynamic \
        --extra-cflags="%{rpmcflags} %{rpmcppflags} -fPIE -DPIE" \
        --extra-ldflags="%{rpmldflags} -pie -Wl,-z,relro -Wl,-z,now" \

-       %{__enable_disable xseg archipelago} \

        --enable-attr \
        %{__enable_disable bluetooth bluez} \
        %{__enable_disable brlapi} \
        --enable-attr \
        %{__enable_disable bluetooth bluez} \
        %{__enable_disable brlapi} \


@@ -853,13 +884,13 @@ build dynamic \
        %{__enable_disable smartcard smartcard} \
        --enable-tpm \
        %{__enable_disable usbredir usb-redir} \
        %{__enable_disable smartcard smartcard} \
        --enable-tpm \
        %{__enable_disable usbredir usb-redir} \

-       --enable-uuid \

        --enable-vde \
        --enable-virtfs \
        --enable-vnc-jpeg \
        --enable-vnc-png \
        --enable-vnc-sasl \
        %{!?with_vte:--disable-vte} \
        --enable-vde \
        --enable-virtfs \
        --enable-vnc-jpeg \
        --enable-vnc-png \
        --enable-vnc-sasl \
        %{!?with_vte:--disable-vte} \

+       %{__enable_disable virgl virglrenderer} \

        %{__enable_disable xen} \
        --enable-modules \
        --disable-netmap \
        %{__enable_disable xen} \
        --enable-modules \
        --disable-netmap \


@@ -867,10 +898,8 @@ build dynamic \
        --enable-lzo \
        %{__enable_disable snappy} \
        --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \
        --enable-lzo \
        %{__enable_disable snappy} \
        --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \

-%if %{without gtk2} && %{without gtk3}
+%if %{without gtk3}

        --disable-gtk
        --disable-gtk

-%else
-       --with-gtkabi="%{?with_gtk2:2.0}%{!?with_gtk2:3.0}"

 %endif
 
 %if %{with user_static}
 %endif
 
 %if %{with user_static}


@@ -891,21 +920,17 @@ build static \
        --disable-spice \
        --disable-tcmalloc \
        --disable-tools \
        --disable-spice \
        --disable-tcmalloc \
        --disable-tools \

-       --disable-uuid \

        --enable-user \
        --disable-system \
        --static
 
 %endif
 
        --enable-user \
        --disable-system \
        --static
 
 %endif
 

-# 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
 %{__cc} %{SOURCE7} %{rpmcflags} -o ksmctl
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT/usr/lib/binfmt.d \
+install -d \

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


@@ -946,14 +971,8 @@ install -p ksmctl $RPM_BUILD_ROOT%{_sbindir}
 install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
 
 install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
 

-install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-

 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.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

 
 %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


@@ -966,7 +985,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}


@@ -1003,13 +1022,16 @@ fi
 %dir /etc/qemu
 %attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper
 %dir /etc/qemu
 %attr(640,root,qemu) %config(noreplace) %verify(not md5 mtime size) /etc/qemu/bridge.conf
 %attr(755,root,root) %{_bindir}/virtfs-proxy-helper

+%{?with_xkbcommon:%attr(755,root,root) %{_bindir}/qemu-keymap}

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

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

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

-%attr(755,root,root) %{_libdir}/qemu-bridge-helper
+%attr(755,root,root) %{_libexecdir}/qemu-bridge-helper

 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
 %attr(755,root,root) %{_sbindir}/ksmctl
 %attr(755,root,root) %{_sbindir}/ksmtuned
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*

+%{_mandir}/man7/qemu-block-drivers.7*

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


@@ -1053,14 +1075,29 @@ fi
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
 %{_datadir}/%{name}/vgabios.bin
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
 %{_datadir}/%{name}/vgabios.bin

+%{_datadir}/%{name}/vgabios-bochs-display.bin

 %{_datadir}/%{name}/vgabios-cirrus.bin
 %{_datadir}/%{name}/vgabios-qxl.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
 
 %dir %{_libdir}/%{name}
 
 %{_datadir}/%{name}/vgabios-stdvga.bin
 %{_datadir}/%{name}/vgabios-virtio.bin
 %{_datadir}/%{name}/vgabios-vmware.bin
 
 %dir %{_libdir}/%{name}
 

+# modules without too many external dependencies
+%attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so
+%{?with_libnfs:%attr(755,root,root) %{_libdir}/%{name}/block-nfs.so}
+
+%attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so
+%{?with_pulseaudio:%attr(755,root,root) %{_libdir}/%{name}/audio-pa.so}
+%{?with_sdl:%attr(755,root,root) %{_libdir}/%{name}/audio-sdl.so}
+%attr(755,root,root) %{_libdir}/%{name}/ui-curses.so
+%if %{with gtk3}
+%attr(755,root,root) %{_libdir}/%{name}/ui-gtk.so
+%endif
+%{?with_sdl:%attr(755,root,root) %{_libdir}/%{name}/ui-sdl.so}
+

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


@@ -1074,10 +1111,12 @@ fi
 %files user
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-aarch64
 %files user
 %defattr(644,root,root,755)
 %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


@@ -1089,11 +1128,14 @@ 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-ppc64abi32
 %attr(755,root,root) %{_bindir}/qemu-ppc64le
 %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-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-s390x
 %attr(755,root,root) %{_bindir}/qemu-sh4
 %attr(755,root,root) %{_bindir}/qemu-sh4eb


@@ -1101,15 +1143,19 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-sparc32plus
 %attr(755,root,root) %{_bindir}/qemu-sparc64
 %attr(755,root,root) %{_bindir}/qemu-x86_64
 %attr(755,root,root) %{_bindir}/qemu-sparc32plus
 %attr(755,root,root) %{_bindir}/qemu-sparc64
 %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)
 %attr(755,root,root) %{_bindir}/qemu-aarch64-static
 
 %if %{with user_static}
 %files user-static
 %defattr(644,root,root,755)
 %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-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-i386-static
 %attr(755,root,root) %{_bindir}/qemu-m68k-static
 %attr(755,root,root) %{_bindir}/qemu-microblaze-static


@@ -1120,11 +1166,14 @@ fi
 %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-mipsel-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32-static
 %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static

-%attr(755,root,root) %{_bindir}/qemu-or32-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-ppc64abi32-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64le-static
 %attr(755,root,root) %{_bindir}/qemu-ppc-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64-static
 %attr(755,root,root) %{_bindir}/qemu-ppc64abi32-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-s390x-static
 %attr(755,root,root) %{_bindir}/qemu-sh4-static
 %attr(755,root,root) %{_bindir}/qemu-sh4eb-static


@@ -1133,6 +1182,8 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-sparc64-static
 %attr(755,root,root) %{_bindir}/qemu-tilegx-static
 %attr(755,root,root) %{_bindir}/qemu-x86_64-static
 %attr(755,root,root) %{_bindir}/qemu-sparc64-static
 %attr(755,root,root) %{_bindir}/qemu-tilegx-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

 %endif
 
 %files system-aarch64
 %endif
 
 %files system-aarch64


@@ -1151,6 +1202,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-cris
 
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-cris
 

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

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


@@ -1175,21 +1231,35 @@ 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}/canyonlands.dtb
+%{_datadir}/%{name}/qemu_vga.ndrv

 %{_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
+
+%files system-riscv64
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-riscv64

 
 %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-netboot.img

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


@@ -1219,7 +1289,6 @@ fi
 %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

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


@@ -1228,24 +1297,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

 %attr(755,root,root) %{_bindir}/qemu-ga
 %{_mandir}/man8/qemu-ga.8*
 
 %attr(755,root,root) %{_bindir}/qemu-ga
 %{_mandir}/man8/qemu-ga.8*
 

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

 %files module-block-curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-curl.so
 
 %files module-block-curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/block-curl.so
 

-%files module-block-dmg
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/block-dmg-bz2.so
-

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


@@ -1258,12 +1316,6 @@ 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)