- ACPI fix

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index 9ba92b7f5ba36ca327184777d7671865c8fed6dc..12277c74e82af5f0b5b6a32e14576d5288ec1ec9 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -43,12 +43,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       5.2.0
-Release:       1
+Version:       6.2.0
+Release:       2
 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
@@ -66,6 +66,7 @@ Patch2:               %{name}-user-execve.patch
 Patch3:                %{name}-xattr.patch
 Patch4:                libjpeg-boolean.patch
 Patch5:                x32.patch
+Patch6:                acpi.patch
 URL:           https://www.qemu.org/
 %{?with_opengl:BuildRequires:  Mesa-libgbm-devel}
 %{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
@@ -132,7 +133,7 @@ BuildRequires:      sphinx-pdg
 BuildRequires: spice-protocol >= 0.12.3
 BuildRequires: spice-server-devel >= 0.12.5
 %endif
-%{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
+%{?with_systemtap:BuildRequires:       systemtap-devel}
 BuildRequires: texi2html
 BuildRequires: texinfo
 %{?with_multipath:BuildRequires:       udev-devel}
@@ -166,7 +167,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-moxie = %{version}-%{release}
 Requires:      %{name}-system-nios2 = %{version}-%{release}
 Requires:      %{name}-system-or1k = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
@@ -257,6 +257,7 @@ Provides:   user(qemu)
 Obsoletes:     qemu-kvm-common
 Obsoletes:     qemu-module-block-archipelago < 2.9.0
 Obsoletes:     qemu-system-lm32
+Obsoletes:     qemu-system-moxie
 Obsoletes:     qemu-system-unicore32
 Conflicts:     qemu < 1.0-2
 
@@ -273,6 +274,20 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 Ten pakiet udostępnia wspólne pliki wymagane przez wszystkie
 środowiska QEMU.
 
+%package devel
+Summary:       Development files for programs using qemu
+Summary(pl.UTF-8):     Pliki programistyczne do programów wykorzystujących qemu
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files needed for developing programs
+using the QEMU.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia programów
+wykorzystujących QEMU.
+
 %package img
 Summary:       QEMU command line tool for manipulating disk images
 Summary(pl.UTF-8):     Narzędzie QEMU do operacji na obrazach dysków
@@ -507,25 +522,6 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 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
@@ -920,6 +916,7 @@ Sondy systemtap/dtrace dla QEMU.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap
 
@@ -1021,7 +1018,6 @@ build static \
        --disable-slirp \
        --disable-spice \
        --disable-system \
-       --disable-tcmalloc \
        --disable-tools \
        --enable-user \
        --disable-xkbcommon \
@@ -1107,9 +1103,6 @@ done
 # 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
 
@@ -1168,6 +1161,7 @@ fi
 %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
+%attr(755,root,root) %{_libdir}/%{name}/audio-jack.so
 %if %{with oss}
 %attr(755,root,root) %{_libdir}/%{name}/audio-oss.so
 %endif
@@ -1179,9 +1173,14 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/chardev-spice.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-display-qxl.so
 %endif
-%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-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-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}/hw-usb-redirect.so
 %attr(755,root,root) %{_libdir}/%{name}/hw-usb-smartcard.so
 %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so
@@ -1207,15 +1206,21 @@ fi
 %{_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}/man7/qemu-storage-daemon-qmp-ref.7*
 %{_mandir}/man8/qemu-nbd.8*
 %{_mandir}/man8/qemu-pr-helper.8*
 %{_docdir}/qemu
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/qemu-plugin.h
+
 %files img
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-img
@@ -1229,6 +1234,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-hexagon
 %attr(755,root,root) %{_bindir}/qemu-hppa
 %attr(755,root,root) %{_bindir}/qemu-i386
 %attr(755,root,root) %{_bindir}/qemu-io
@@ -1267,6 +1273,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-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
@@ -1294,23 +1301,28 @@ fi
 %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
+%if %{with systemtap}
 %attr(755,root,root) %{_bindir}/qemu-trace-stap-static
 %endif
+%endif
 
 %files system-aarch64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-aarch64
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-aarch64.so
 %{_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
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-alpha.so
 %{_datadir}/%{name}/palcode-clipper
 
 %files system-arm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-arm
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-arm.so
 %{_datadir}/%{name}/edk2-arm-code.fd
 %{_datadir}/%{name}/edk2-arm-vars.fd
 %{_datadir}/%{name}/firmware/60-edk2-arm.json
@@ -1319,24 +1331,29 @@ fi
 %files system-avr
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-avr
-
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-avr.so
 %files system-cris
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-cris
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-cris.so
 
 %files system-hppa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-hppa
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-hppa.so
 %{_datadir}/%{name}/hppa-firmware.img
 
 %files system-m68k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-m68k
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-m68k.so
 
 %files system-microblaze
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-microblaze
 %attr(755,root,root) %{_bindir}/qemu-system-microblazeel
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-microblaze.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-microblazeel.so
 
 %files system-mips
 %defattr(644,root,root,755)
@@ -1344,23 +1361,27 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-mipsel
 %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
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mips.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mips64.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mips64el.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-mipsel.so
 
 %files system-nios2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-nios2
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-nios2.so
 
 %files system-or1k
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-or1k
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-or1k.so
 
 %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) %{_libdir}/%{name}/accel-qtest-ppc.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-ppc64.so
 %{_datadir}/%{name}/bamboo.dtb
 %{_datadir}/%{name}/canyonlands.dtb
 %{_datadir}/%{name}/openbios-ppc
@@ -1375,22 +1396,26 @@ fi
 %files system-riscv32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-riscv32
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-riscv32.so
 %{_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
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-riscv64.so
 %{_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
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-rx.so
 
 %files system-s390x
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-s390x
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-s390x.so
 %{_datadir}/%{name}/s390-ccw.img
 %{_datadir}/%{name}/s390-netboot.img
 
@@ -1398,11 +1423,15 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-sh4
 %attr(755,root,root) %{_bindir}/qemu-system-sh4eb
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sh4.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sh4eb.so
 
 %files system-sparc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-sparc
 %attr(755,root,root) %{_bindir}/qemu-system-sparc64
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sparc.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-sparc64.so
 %{_datadir}/%{name}/QEMU,cgthree.bin
 %{_datadir}/%{name}/QEMU,tcx.bin
 %{_datadir}/%{name}/openbios-sparc32
@@ -1411,11 +1440,16 @@ fi
 %files system-tricore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-tricore
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-tricore.so
 
 %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
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-i386.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-x86_64.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-tcg-i386.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-tcg-x86_64.so
 %ifarch %{ix86} %{x8664} x32
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/kvm.conf
 /lib/udev/rules.d/80-kvm.rules
@@ -1440,6 +1474,7 @@ fi
 %{_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
@@ -1467,6 +1502,8 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-xtensa
 %attr(755,root,root) %{_bindir}/qemu-system-xtensaeb
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-xtensa.so
+%attr(755,root,root) %{_libdir}/%{name}/accel-qtest-xtensaeb.so
 
 %files guest-agent
 %defattr(644,root,root,755)