- updated to 6.2.0; -system-moxie is gone

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index a20c1b4ae2324783c7c7950841549e75a1acb1c6..d6436119e5b8db344ec709d3db27ac9567e24529 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -29,7 +29,7 @@
 %bcond_without virgl           # build virgl support
 %bcond_without xkbcommon       # xkbcommon support
 
 %bcond_without virgl           # build virgl support
 %bcond_without xkbcommon       # xkbcommon support
 

-%if %{without gtk}
+%if %{without gtk3}

 %undefine      with_vte
 %endif
 %ifarch x32
 %undefine      with_vte
 %endif
 %ifarch x32


@@ -42,12 +42,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:       5.2.0
-Release:       2
+Version:       6.2.0
+Release:       1

 License:       GPL v2, BSD (edk2 firmware files)
 Group:         Applications/Emulators
 Source0:       https://download.qemu.org/%{name}-%{version}.tar.xz
 License:       GPL v2, BSD (edk2 firmware files)
 Group:         Applications/Emulators
 Source0:       https://download.qemu.org/%{name}-%{version}.tar.xz

-# Source0-md5: 179f86928835da857c237b42f4b2df73
+# Source0-md5: a077669ce58b6ee07ec355e54aad25be

 # 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


@@ -70,7 +70,7 @@ Patch1:               %{name}-user-execve.patch
 Patch2:                %{name}-xattr.patch
 Patch3:                libjpeg-boolean.patch
 Patch4:                x32.patch
 Patch2:                %{name}-xattr.patch
 Patch3:                libjpeg-boolean.patch
 Patch4:                x32.patch

-Patch5:                binutils-2.36.patch
+Patch5:                %{name}-u2f-emu.patch

 URL:           https://www.qemu.org/
 %{?with_opengl:BuildRequires:  Mesa-libgbm-devel}
 %{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
 URL:           https://www.qemu.org/
 %{?with_opengl:BuildRequires:  Mesa-libgbm-devel}
 %{?with_opengl:BuildRequires:  OpenGL-GLX-devel}


@@ -80,22 +80,29 @@ URL:                https://www.qemu.org/
 BuildRequires: alsa-lib-devel
 %{?with_brlapi:BuildRequires:  brlapi-devel}
 BuildRequires: bzip2-devel
 BuildRequires: alsa-lib-devel
 %{?with_brlapi:BuildRequires:  brlapi-devel}
 BuildRequires: bzip2-devel

-BuildRequires: capstone-devel >= 3.0.5
-%{?with_ceph:BuildRequires:    ceph-devel}
-BuildRequires: curl-devel
+BuildRequires: capstone-devel >= 4.0
+%{?with_ceph:BuildRequires:    ceph-devel >= 12}
+BuildRequires: curl-devel >= 7.29.0

 BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: cyrus-sasl-devel >= 2

+BuildRequires: daxctl-devel >= 57
+BuildRequires: gcc >= 6:7.4

 BuildRequires: gettext-tools
 BuildRequires: gettext-tools

-BuildRequires: glib2-devel >= 1:2.48
+BuildRequires: glib2-devel >= 1:2.56

 # minimal is 3.4 but new features are used up to 6
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 6}
 # minimal is 3.4 but new features are used up to 6
 %{?with_glusterfs:BuildRequires:       glusterfs-devel >= 6}

-BuildRequires: gnutls-devel >= 3.1.18
+BuildRequires: gnutls-devel >= 3.6.14

 %{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.22.0}
 %{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.22.0}

+BuildRequires: jack-audio-connection-kit-devel
+# for tests
+#BuildRequires:        keyutils-devel

 BuildRequires: libaio-devel
 BuildRequires: libaio-devel

+BuildRequires: libbpf-devel

 %{?with_smartcard:BuildRequires:       libcacard-devel >= 2.5.1}
 BuildRequires: libcap-ng-devel
 BuildRequires: libdrm-devel
 %{?with_opengl:BuildRequires:  libepoxy-devel}
 %{?with_smartcard:BuildRequires:       libcacard-devel >= 2.5.1}
 BuildRequires: libcap-ng-devel
 BuildRequires: libdrm-devel
 %{?with_opengl:BuildRequires:  libepoxy-devel}

-BuildRequires: libfdt-devel >= 1.4.2
+BuildRequires: libfdt-devel >= 1.5.1
+BuildRequires: libfuse3-devel >= 3.8

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


@@ -104,10 +111,12 @@ BuildRequires:    libjpeg-devel
 BuildRequires: libpng-devel
 %{?with_rdma:BuildRequires:    librdmacm-devel}
 %{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0}
 BuildRequires: libpng-devel
 %{?with_rdma:BuildRequires:    librdmacm-devel}
 %{?with_seccomp:BuildRequires: libseccomp-devel >= 2.3.0}

-BuildRequires: libssh-devel >= 0.8
+BuildRequires: libselinux-devel
+BuildRequires: libssh-devel >= 0.8.7

 BuildRequires: libslirp-devel >= 4.0.0
 # for tests only
 #BuildRequires:        libtasn1-devel
 BuildRequires: libslirp-devel >= 4.0.0
 # for tests only
 #BuildRequires:        libtasn1-devel

+BuildRequires: libu2f-emu-devel

 BuildRequires: libusb-devel >= 1.0.22
 BuildRequires: liburing-devel
 BuildRequires: libuuid-devel
 BuildRequires: libusb-devel >= 1.0.22
 BuildRequires: liburing-devel
 BuildRequires: libuuid-devel


@@ -115,11 +124,11 @@ BuildRequires:    libxml2-devel >= 2.0
 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzfse-devel
 BuildRequires: lzo-devel >= 2
 %{?with_lttng:BuildRequires:   lttng-ust-devel}
 BuildRequires: lzfse-devel
 BuildRequires: lzo-devel >= 2

-BuildRequires: meson >= 0.55.0
+BuildRequires: meson >= 0.59.3

 %{?with_multipath:BuildRequires:       multipath-tools-devel}
 BuildRequires: ncurses-devel
 %{?with_multipath:BuildRequires:       multipath-tools-devel}
 BuildRequires: ncurses-devel

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

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


@@ -130,7 +139,8 @@ BuildRequires:      pixman-devel >= 0.21.8
 BuildRequires: pkgconfig
 %{?with_pmem:BuildRequires:    pmdk-devel}
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel}
 BuildRequires: pkgconfig
 %{?with_pmem:BuildRequires:    pmdk-devel}
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel}

-BuildRequires: python3 >= 1:3.5
+BuildRequires: python3 >= 1:3.6
+BuildRequires: rpm-build >= 4.6

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


@@ -152,8 +162,8 @@ BuildRequires:      which
 %{?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+
 %{?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}
+# min version is 4.2, more features up to 4.11
+%{?with_xen:BuildRequires:     xen-devel >= 4.11}

 BuildRequires: xfsprogs-devel
 %if %{with xkbcommon}
 BuildRequires: xkeyboard-config
 BuildRequires: xfsprogs-devel
 %if %{with xkbcommon}
 BuildRequires: xkeyboard-config


@@ -164,7 +174,7 @@ BuildRequires:      xz
 BuildRequires: zlib-devel
 BuildRequires: zstd-devel >= 1.4.0
 %if %{with user_static}
 BuildRequires: zlib-devel
 BuildRequires: zstd-devel >= 1.4.0
 %if %{with user_static}

-BuildRequires: glib2-static >= 1:2.48
+BuildRequires: glib2-static >= 1:2.56

 BuildRequires: glibc-static
 BuildRequires: pcre-static
 BuildRequires: zlib-static
 BuildRequires: glibc-static
 BuildRequires: pcre-static
 BuildRequires: zlib-static


@@ -179,7 +189,6 @@ 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-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}

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

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


@@ -193,14 +202,17 @@ Requires: %{name}-system-tricore = %{version}-%{release}
 Requires:      %{name}-system-x86 = %{version}-%{release}
 Requires:      %{name}-system-xtensa = %{version}-%{release}
 Requires:      %{name}-user = %{version}-%{release}
 Requires:      %{name}-system-x86 = %{version}-%{release}
 Requires:      %{name}-system-xtensa = %{version}-%{release}
 Requires:      %{name}-user = %{version}-%{release}

-Obsoletes:     qemu-kvm
+Obsoletes:     qemu-kvm < 2

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

-Requires:      capstone >= 3.0.5 \
+Requires:      capstone >= 4.0 \
+Requires:      daxctl-libs >= 57 \

 %{?with_smartcard:Requires:    libcacard >= 2.5.1} \
 %{?with_smartcard:Requires:    libcacard >= 2.5.1} \

-Requires:      libfdt >= 1.4.2 \
+Requires:      libfdt >= 1.5.1 \
+Requires:      libfuse3 >= 3.8 \
+%{?with_iscsi:Requires:        libiscsi >= 1.9.0} \

 %if %{with seccomp} \
 Requires:      libseccomp >= 2.3.0 \
 %endif \
 %if %{with seccomp} \
 Requires:      libseccomp >= 2.3.0 \
 %endif \


@@ -212,8 +224,7 @@ Requires:   spice-server-libs >= 0.12.5 \
 %endif \
 %if %{with usbredir} \
 Requires:      usbredir >= 0.6 \
 %endif \
 %if %{with usbredir} \
 Requires:      usbredir >= 0.6 \

-%endif \
-Requires:      zstd >= 1.4.0
+%endif

 
 # 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/.*


@@ -250,6 +261,18 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy:
   używane do wirtualnego hostowania kilku wirtualnych pecetów na
   pojedynczym serwerze.
 
   używane do wirtualnego hostowania kilku wirtualnych pecetów na
   pojedynczym serwerze.
 

+%package devel
+Summary:       Header file for QEMU plugins development
+Summary(pl.UTF-8):     Plik nagłówkowy do tworzenia wtyczek QEMU
+Group:         Development/Libraries
+BuildArch:     noarch
+
+%description devel
+Header file for QEMU plugins development.
+
+%description devel -l pl.UTF-8
+Plik nagłówkowy do tworzenia wtyczek 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
 %package common
 Summary:       QEMU common files needed by all QEMU targets
 Summary(pl.UTF-8):     Wspólne pliki QEMU wymagane przez wszystkie środowiska QEMU


@@ -261,16 +284,18 @@ 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.48
-Requires:      gnutls-libs >= 3.1.18
+Requires:      glib2 >= 1:2.56
+Requires:      gnutls-libs >= 3.6.14

 %{?with_gtk3:Requires: gtk+3 >= 3.22.0}
 %{?with_gtk3:Requires: gtk+3 >= 3.22.0}

-Requires:      nettle >= 2.7.1
+Requires:      nettle >= 3.4

 Requires:      systemd-units >= 38
 %{?with_vte:Requires:  vte >= 0.32.0}
 Requires:      systemd-units >= 38
 %{?with_vte:Requires:  vte >= 0.32.0}

+Requires:      zstd >= 1.4.0

 Provides:      group(qemu)
 Provides:      user(qemu)
 Provides:      group(qemu)
 Provides:      user(qemu)

-Obsoletes:     qemu-kvm-common
+Obsoletes:     qemu-kvm-common < 2

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

+Obsoletes:     qemu-system-moxie < 6.1

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


@@ -290,7 +315,7 @@ Ten pakiet udostępnia wspólne pliki wymagane przez wszystkie
 Summary:       QEMU command line tool for manipulating disk images
 Summary(pl.UTF-8):     Narzędzie QEMU do operacji na obrazach dysków
 Group:         Applications/Emulators
 Summary:       QEMU command line tool for manipulating disk images
 Summary(pl.UTF-8):     Narzędzie QEMU do operacji na obrazach dysków
 Group:         Applications/Emulators

-Obsoletes:     qemu-kvm-img
+Obsoletes:     qemu-kvm-img < 2

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


@@ -308,7 +333,7 @@ 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

-Obsoletes:     qemu-kvm-user
+Obsoletes:     qemu-kvm-user < 2

 
 %description user
 QEMU is a generic and open source processor emulator which achieves a
 
 %description user
 QEMU is a generic and open source processor emulator which achieves a


@@ -349,7 +374,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem AArch64
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-aarch64
+Obsoletes:     qemu-kvm-system-aarch64 < 2

 
 %description system-aarch64
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-aarch64
 QEMU is a generic and open source processor emulator which achieves a


@@ -369,7 +394,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem Alpha
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-alpha
+Obsoletes:     qemu-kvm-system-alpha < 2

 
 %description system-alpha
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-alpha
 QEMU is a generic and open source processor emulator which achieves a


@@ -389,7 +414,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z 32-bitowym procesorem ARM
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-arm
+Obsoletes:     qemu-kvm-system-arm < 2

 
 %description system-arm
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-arm
 QEMU is a generic and open source processor emulator which achieves a


@@ -409,7 +434,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem AVR
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-avr
+Obsoletes:     qemu-kvm-system-avr < 2

 
 %description system-avr
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-avr
 QEMU is a generic and open source processor emulator which achieves a


@@ -429,7 +454,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem CRIS
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-cris
+Obsoletes:     qemu-kvm-system-cris < 2

 
 %description system-cris
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-cris
 QEMU is a generic and open source processor emulator which achieves a


@@ -468,7 +493,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem m68k
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-m68k
+Obsoletes:     qemu-kvm-system-m68k < 2

 
 %description system-m68k
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-m68k
 QEMU is a generic and open source processor emulator which achieves a


@@ -490,7 +515,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem MicroBlaze
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-microblaze
+Obsoletes:     qemu-kvm-system-microblaze < 2

 
 %description system-microblaze
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-microblaze
 QEMU is a generic and open source processor emulator which achieves a


@@ -510,7 +535,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem MIPS
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-mips
+Obsoletes:     qemu-kvm-system-mips < 2

 
 %description system-mips
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-mips
 QEMU is a generic and open source processor emulator which achieves a


@@ -524,25 +549,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem MIPS.
 
 
 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
-Group:         Applications/Emulators
-Requires:      %{name}-common = %{version}-%{release}
-%systempkg_req
-
-%description system-moxie
-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 Moxie CPU.
-
-%description system-moxie -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 Moxie.
-

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


@@ -568,8 +574,8 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem OpenRISC
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-or1k
-Obsoletes:     qemu-system-or32
+Obsoletes:     qemu-kvm-system-or1k < 2
+Obsoletes:     qemu-system-or32 < 2.9.0

 
 %description system-or1k
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-or1k
 QEMU is a generic and open source processor emulator which achieves a


@@ -589,7 +595,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem PowerPC
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-ppc
+Obsoletes:     qemu-kvm-system-ppc < 2

 
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-ppc
 QEMU is a generic and open source processor emulator which achieves a


@@ -666,7 +672,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem S390x (IBM Z)
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-s390x
+Obsoletes:     qemu-kvm-system-s390x < 2

 
 %description system-s390x
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-s390x
 QEMU is a generic and open source processor emulator which achieves a


@@ -686,7 +692,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem SH4
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-sh4
+Obsoletes:     qemu-kvm-system-sh4 < 2

 
 %description system-sh4
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-sh4
 QEMU is a generic and open source processor emulator which achieves a


@@ -706,7 +712,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem SPARC
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-sparc
+Obsoletes:     qemu-kvm-system-sparc < 2

 
 %description system-sparc
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-sparc
 QEMU is a generic and open source processor emulator which achieves a


@@ -733,7 +739,7 @@ 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.
 
 QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
 dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 


@@ -746,8 +752,8 @@ 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

-Obsoletes:     kvm
-Obsoletes:     qemu-kvm-system-x86
+Obsoletes:     kvm < 89
+Obsoletes:     qemu-kvm-system-x86 < 2

 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-x86
 QEMU is a generic and open source processor emulator which achieves a


@@ -767,7 +773,7 @@ Summary(pl.UTF-8):  QEMU - emulator systemu z procesorem Xtensa
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %systempkg_req

-Obsoletes:     qemu-kvm-system-xtensa
+Obsoletes:     qemu-kvm-system-xtensa < 2

 
 %description system-xtensa
 QEMU is a generic and open source processor emulator which achieves a
 
 %description system-xtensa
 QEMU is a generic and open source processor emulator which achieves a


@@ -786,9 +792,9 @@ 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.48
+Requires:      glib2 >= 1:2.56

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

-Obsoletes:     qemu-kvm-guest-agent
+Obsoletes:     qemu-kvm-guest-agent < 2

 Conflicts:     SysVinit < 2.96-2
 
 %description guest-agent
 Conflicts:     SysVinit < 2.96-2
 
 %description guest-agent


@@ -811,11 +817,24 @@ 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-audio-jack
+Summary:       QEMU module for JACK audio output
+Summary(pl.UTF-8):     Moduł QEMU z wyjściem dźwięku JACK
+Group:         Applications/Emulators
+Requires:      %{name}-common = %{version}-%{release}
+
+%description module-audio-jack
+QEMU module for JACK audio output.
+
+%description module-audio-jack -l pl.UTF-8
+Moduł QEMU z wyjściem dźwięku JACK.
+

 %package module-block-curl
 Summary:       QEMU module for 'curl' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'curl'
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 %package module-block-curl
 Summary:       QEMU module for 'curl' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'curl'
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}

+Requires:      curl-libs >= 7.29.0

 
 %description module-block-curl
 QEMU block device support for CURL. It allows to access remote disks
 
 %description module-block-curl
 QEMU block device support for CURL. It allows to access remote disks


@@ -873,6 +892,7 @@ Summary:    QEMU module for 'rbd' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'rbd'
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'rbd'
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}

+Requires:      ceph-libs >= 12

 
 %description module-block-rbd
 QEMU block device support for Ceph/RBD volumes.
 
 %description module-block-rbd
 QEMU block device support for Ceph/RBD volumes.


@@ -885,7 +905,7 @@ Summary:    QEMU module for 'ssh' block devices
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'ssh'
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}
 Summary(pl.UTF-8):     Moduł QEMU dla urządeń blokowych typu 'ssh'
 Group:         Applications/Emulators
 Requires:      %{name}-common = %{version}-%{release}

-Requires:      libssh >= 0.8
+Requires:      libssh >= 0.8.7

 
 %description module-block-ssh
 QEMU block device support for accessing remote disks using the Secure
 
 %description module-block-ssh
 QEMU block device support for accessing remote disks using the Secure


@@ -945,8 +965,9 @@ Sondy systemtap/dtrace dla QEMU.
 
 %if %{with systemtap}
 # don't require stap binary during build
 
 %if %{with systemtap}
 # don't require stap binary during build

-%{__sed} -i -e "s/has 'stap'/true/" configure
+%{__sed} -i -e "s/stap.found()/true/" meson.build docs/meson.build scripts/meson.build

 %endif
 %endif

+

 %build
 
 build() {
 %build
 
 build() {


@@ -981,7 +1002,7 @@ build() {
 build dynamic \
        --extra-cflags="%{rpmcflags} %{rpmcppflags}" \
        --extra-ldflags="%{rpmldflags} -Wl,-z,relro -Wl,-z,now" \
 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}" \
+       --audio-drv-list="alsa,jack%{?with_oss:,oss}%{?with_pulseaudio:,pa}%{?with_sdl:,sdl}" \

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


@@ -1175,12 +1196,6 @@ fi
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin
 # bios.bin provided by qemu is stripped to 128k, with no Xen support, keep it
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin
 # bios.bin provided by qemu is stripped to 128k, with no Xen support, keep it

-for f in $RPM_BUILD_ROOT%{_datadir}/%{name}/*.aml ; do
-       bn="$(basename $f)"
-       if [ -e "/usr/share/seabios/$bn" ] ; then
-               ln -sf "/usr/share/seabios/$bn" "$f"
-       fi
-done

 %endif
 
 %if %{with gtk3}
 %endif
 
 %if %{with gtk3}


@@ -1195,13 +1210,15 @@ for t in client server; do
        cp -p build-dynamic/contrib/ivshmem-$t/ivshmem-$t $RPM_BUILD_ROOT%{_bindir}
 done
 
        cp -p build-dynamic/contrib/ivshmem-$t/ivshmem-$t $RPM_BUILD_ROOT%{_bindir}
 done
 

+# test modules
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/accel-qtest-*.so

 # 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
 # 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}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/{.buildinfo,objects.inv}

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


@@ -1262,6 +1279,10 @@ fi
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)
 

+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/qemu-plugin.h
+

 %files common -f %{name}.lang
 %defattr(644,root,root,755)
 %doc LICENSE README.rst pc-bios/edk2-licenses.txt
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
 %doc LICENSE README.rst pc-bios/edk2-licenses.txt


@@ -1297,6 +1318,8 @@ fi
 # 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
 # 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}/accel-tcg-i386.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-tcg-x86_64.so

 %attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so
 %if %{with oss}
 %attr(755,root,root) %{_libdir}/%{name}/audio-oss.so
 %attr(755,root,root) %{_libdir}/%{name}/audio-alsa.so
 %if %{with oss}
 %attr(755,root,root) %{_libdir}/%{name}/audio-oss.so


@@ -1308,9 +1331,14 @@ fi
 %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}/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-gpu.so

+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-gl.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci-gl.so

 %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga.so

+%attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga-gl.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so
+%attr(755,root,root) %{_libdir}/%{name}/hw-usb-host.so

 %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so
 %if %{with usbredir}
 %attr(755,root,root) %{_libdir}/%{name}/hw-usb-redirect.so
 %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so
 %if %{with usbredir}
 %attr(755,root,root) %{_libdir}/%{name}/hw-usb-redirect.so


@@ -1342,11 +1370,13 @@ fi
 %{_iconsdir}/hicolor/32x32/apps/qemu.bmp
 %{_iconsdir}/hicolor/scalable/apps/qemu.svg
 %{_mandir}/man1/qemu.1*
 %{_iconsdir}/hicolor/32x32/apps/qemu.bmp
 %{_iconsdir}/hicolor/scalable/apps/qemu.svg
 %{_mandir}/man1/qemu.1*

+%{_mandir}/man1/qemu-storage-daemon.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}/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}/man7/qemu-storage-daemon-qmp-ref.7*

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


@@ -1365,6 +1395,7 @@ fi
 %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-arm
 %attr(755,root,root) %{_bindir}/qemu-armeb
 %attr(755,root,root) %{_bindir}/qemu-cris

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

 %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-hppa
 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io


@@ -1404,6 +1435,7 @@ fi
 %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-arm-static
 %attr(755,root,root) %{_bindir}/qemu-armeb-static
 %attr(755,root,root) %{_bindir}/qemu-cris-static

+%attr(755,root,root) %{_bindir}/qemu-hexagon-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-hppa-static
 %attr(755,root,root) %{_bindir}/qemu-i386-static
 %attr(755,root,root) %{_bindir}/qemu-m68k-static


@@ -1482,10 +1514,6 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-mips64
 %attr(755,root,root) %{_bindir}/qemu-system-mips64el
 
 %attr(755,root,root) %{_bindir}/qemu-system-mips64
 %attr(755,root,root) %{_bindir}/qemu-system-mips64el
 

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

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


@@ -1577,6 +1605,7 @@ fi
 %{_datadir}/%{name}/linuxboot.bin
 %{_datadir}/%{name}/linuxboot_dma.bin
 %{_datadir}/%{name}/multiboot.bin
 %{_datadir}/%{name}/linuxboot.bin
 %{_datadir}/%{name}/linuxboot_dma.bin
 %{_datadir}/%{name}/multiboot.bin

+%{_datadir}/%{name}/multiboot_dma.bin

 %{_datadir}/%{name}/pvh.bin
 %{_datadir}/%{name}/pxe-e1000.rom
 %{_datadir}/%{name}/pxe-eepro100.rom
 %{_datadir}/%{name}/pvh.bin
 %{_datadir}/%{name}/pxe-e1000.rom
 %{_datadir}/%{name}/pxe-eepro100.rom


@@ -1615,6 +1644,10 @@ fi
 %{_mandir}/man7/qemu-ga-ref.7*
 %{_mandir}/man8/qemu-ga.8*
 
 %{_mandir}/man7/qemu-ga-ref.7*
 %{_mandir}/man8/qemu-ga.8*
 

+%files module-audio-jack
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/audio-jack.so
+

 %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