From c5a48fe0b55b4704df6d476758640bf51a1dcd5373684847da22ca7d2c5f76e0 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Tue, 25 Sep 2018 15:06:25 +0000 Subject: [PATCH] Accepting request 638228 from home:bfrogers:branches:Virtualization more misc spec file fixes OBS-URL: https://build.opensuse.org/request/show/638228 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=429 --- qemu-testsuite.changes | 13 ++++++++ qemu-testsuite.spec | 67 +++++++++++++++++++++++++++++++++++------- qemu.changes | 13 ++++++++ qemu.spec | 67 +++++++++++++++++++++++++++++++++++------- qemu.spec.in | 67 +++++++++++++++++++++++++++++++++++------- 5 files changed, 194 insertions(+), 33 deletions(-) diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 9b83c46e..cfb2f818 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 24 21:25:37 UTC 2018 - Bruce Rogers + +- Do more misc spec file fixes: +* Be explicit in spec file about Version used for all subpackages + (again, to avoid subpackage ordering issues). Default Release + tag is also brought in by obs format_spec_file service +* Delete binary blob s390-netboot.img, which we rebuild +* Don't provide separate Url for qemu-kvm package - the main qemu + website provides easily findable link for kvm specifics +* Associate petalogix-ml605.dtb with qemu-extra instead of qemu-ppc +* More entry sorting + ------------------------------------------------------------------- Fri Sep 21 19:35:23 UTC 2018 - Bruce Rogers diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index f94c8411..9f7338ac 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -440,7 +440,7 @@ Recommends: qemu-ksm = %{qemuver} %endif %ifarch s390x -%define s390x_default_built_firmware {s390-ccw.img} +%define s390x_default_built_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_built_firmware {%nil} %endif @@ -488,6 +488,8 @@ This package acts as an umbrella package to the other QEMU sub-packages. %package x86 Summary: Machine emulator and virtualizer for x86 architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Requires: qemu-ipxe Requires: qemu-seabios @@ -508,6 +510,8 @@ This package provides i386 and x86_64 emulation. %package ppc Summary: Machine emulator and virtualizer for Power architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -524,6 +528,8 @@ This package provides ppc and ppc64 emulation. %package s390 Summary: Machine emulator and virtualizer for S/390 architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} %description s390 @@ -538,6 +544,8 @@ This package provides s390x emulation. %package arm Summary: Machine emulator and virtualizer for ARM architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -556,6 +564,8 @@ This package provides arm emulation. %package extra Summary: Machine emulator and virtualizer for "extra" architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -573,9 +583,10 @@ more popular QEMU packages which are dedicated to a single architecture.) %if %{legacy_qemu_kvm} %package kvm -Url: http://www.linux-kvm.org Summary: Wrapper to enable KVM acceleration under QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %ifarch %ix86 x86_64 Requires: qemu-x86 = %{qemuver} %endif @@ -601,6 +612,8 @@ is invoked. It provides no additional benefit, and is considered deprecated. %package lang Summary: Translations for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %description lang This package contains a few language translations, particularly for the @@ -621,6 +634,8 @@ Conflicts: qemu-tools > %{qemuver}-%{release} %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_libdir/%name/block-curl.so %{qemu_module_conflicts} @@ -631,6 +646,8 @@ a network connection from qemu-img tool and QEMU system emulation. %package block-dmg Summary: DMG block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-dmg @@ -641,6 +658,8 @@ qemu-img tool and QEMU system emulation. %package block-gluster Summary: GlusterFS block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-gluster @@ -652,6 +671,8 @@ GlusterFS network connection from qemu-img tool and QEMU system emulation. %package block-iscsi Summary: iSCSI block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-iscsi @@ -663,6 +684,8 @@ iSCSI network connection from qemu-img tool and QEMU system emulation. %package block-rbd Summary: Rados Block Device (Ceph) support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-rbd @@ -672,6 +695,8 @@ This package contains a module for accessing ceph (rbd,rados) image files. %package block-ssh Summary: SSH (SFTP) block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-ssh @@ -681,6 +706,8 @@ SSH network connection from qemu-img tool and QEMU system emulation. %package ui-curses Summary: Curses based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-curses @@ -689,6 +716,8 @@ This package contains a module for doing curses based UI for QEMU. %package ui-gtk Summary: GTK based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-gtk @@ -698,6 +727,8 @@ This package contains a module for doing GTK based UI for QEMU. %package ui-sdl Summary: SDL based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-sdl @@ -707,6 +738,8 @@ This package contains a module for doing SDL based UI for QEMU. %package audio-alsa Summary: ALSA based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-alsa @@ -715,6 +748,8 @@ This package contains a module for ALSA based audio support for QEMU. %package audio-oss Summary: OSS based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-oss @@ -723,6 +758,8 @@ This package contains a module for OSS based audio support for QEMU. %package audio-pa Summary: Pulse Audio based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-pa @@ -732,6 +769,8 @@ This package contains a module for Pulse Audio based audio support for QEMU. %package audio-sdl Summary: SDL based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-sdl @@ -741,6 +780,8 @@ This package contains a module for SDL based audio support for QEMU. %package tools Summary: Tools for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_libexecdir/qemu-bridge-helper Requires(pre): permissions Requires(pre): shadow @@ -756,6 +797,8 @@ a virtfs helper, ivshmem, disk utilities and scripts for various purposes. %package guest-agent Summary: Guest agent for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_bindir/qemu-ga Requires(pre): shadow Requires(post): udev @@ -824,6 +867,8 @@ network adapters available with QEMU. %package ksm Summary: Kernel Samepage Merging services Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires(pre): coreutils Requires(post): coreutils @@ -1409,17 +1454,16 @@ fi %_bindir/qemu-system-ppc %_bindir/qemu-system-ppc64 %_bindir/qemu-system-ppcemb -%_datadir/%name/ppc_rom.bin +%_datadir/%name/bamboo.dtb +%_datadir/%name/canyonlands.dtb %_datadir/%name/openbios-ppc +%_datadir/%name/ppc_rom.bin +%_datadir/%name/qemu_vga.ndrv +%_datadir/%name/skiboot.lid %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin %_datadir/%name/u-boot.e500 %_datadir/%name/u-boot-sam460-20100605.bin -%_datadir/%name/bamboo.dtb -%_datadir/%name/canyonlands.dtb -%_datadir/%name/petalogix-ml605.dtb -%_datadir/%name/skiboot.lid -%_datadir/%name/qemu_vga.ndrv %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-ppc %_docdir/qemu-ppc/supported.txt @@ -1471,9 +1515,10 @@ fi %_bindir/qemu-system-xtensa %_bindir/qemu-system-xtensaeb %_datadir/%name/hppa-firmware.img -%_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 +%_datadir/%name/palcode-clipper +%_datadir/%name/petalogix-ml605.dtb %_datadir/%name/petalogix-s3adsp1800.dtb %_datadir/%name/QEMU,cgthree.bin %_datadir/%name/QEMU,tcx.bin @@ -1594,15 +1639,15 @@ fi %dir %_datadir/%name %_datadir/%name/pxe-e1000.rom %_datadir/%name/pxe-eepro100.rom -%_datadir/%name/pxe-pcnet.rom %_datadir/%name/pxe-ne2k_pci.rom +%_datadir/%name/pxe-pcnet.rom %_datadir/%name/pxe-rtl8139.rom %_datadir/%name/pxe-virtio.rom %_datadir/%name/efi-e1000.rom %_datadir/%name/efi-e1000e.rom %_datadir/%name/efi-eepro100.rom -%_datadir/%name/efi-pcnet.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 diff --git a/qemu.changes b/qemu.changes index 9b83c46e..cfb2f818 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 24 21:25:37 UTC 2018 - Bruce Rogers + +- Do more misc spec file fixes: +* Be explicit in spec file about Version used for all subpackages + (again, to avoid subpackage ordering issues). Default Release + tag is also brought in by obs format_spec_file service +* Delete binary blob s390-netboot.img, which we rebuild +* Don't provide separate Url for qemu-kvm package - the main qemu + website provides easily findable link for kvm specifics +* Associate petalogix-ml605.dtb with qemu-extra instead of qemu-ppc +* More entry sorting + ------------------------------------------------------------------- Fri Sep 21 19:35:23 UTC 2018 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index bc72f9f9..399e73c2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -440,7 +440,7 @@ Recommends: qemu-ksm = %{qemuver} %endif %ifarch s390x -%define s390x_default_built_firmware {s390-ccw.img} +%define s390x_default_built_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_built_firmware {%nil} %endif @@ -488,6 +488,8 @@ This package acts as an umbrella package to the other QEMU sub-packages. %package x86 Summary: Machine emulator and virtualizer for x86 architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Requires: qemu-ipxe Requires: qemu-seabios @@ -508,6 +510,8 @@ This package provides i386 and x86_64 emulation. %package ppc Summary: Machine emulator and virtualizer for Power architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -524,6 +528,8 @@ This package provides ppc and ppc64 emulation. %package s390 Summary: Machine emulator and virtualizer for S/390 architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} %description s390 @@ -538,6 +544,8 @@ This package provides s390x emulation. %package arm Summary: Machine emulator and virtualizer for ARM architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -556,6 +564,8 @@ This package provides arm emulation. %package extra Summary: Machine emulator and virtualizer for "extra" architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -573,9 +583,10 @@ more popular QEMU packages which are dedicated to a single architecture.) %if %{legacy_qemu_kvm} %package kvm -Url: http://www.linux-kvm.org Summary: Wrapper to enable KVM acceleration under QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %ifarch %ix86 x86_64 Requires: qemu-x86 = %{qemuver} %endif @@ -601,6 +612,8 @@ is invoked. It provides no additional benefit, and is considered deprecated. %package lang Summary: Translations for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %description lang This package contains a few language translations, particularly for the @@ -621,6 +634,8 @@ Conflicts: qemu-tools > %{qemuver}-%{release} %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_libdir/%name/block-curl.so %{qemu_module_conflicts} @@ -631,6 +646,8 @@ a network connection from qemu-img tool and QEMU system emulation. %package block-dmg Summary: DMG block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-dmg @@ -641,6 +658,8 @@ qemu-img tool and QEMU system emulation. %package block-gluster Summary: GlusterFS block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-gluster @@ -652,6 +671,8 @@ GlusterFS network connection from qemu-img tool and QEMU system emulation. %package block-iscsi Summary: iSCSI block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-iscsi @@ -663,6 +684,8 @@ iSCSI network connection from qemu-img tool and QEMU system emulation. %package block-rbd Summary: Rados Block Device (Ceph) support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-rbd @@ -672,6 +695,8 @@ This package contains a module for accessing ceph (rbd,rados) image files. %package block-ssh Summary: SSH (SFTP) block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-ssh @@ -681,6 +706,8 @@ SSH network connection from qemu-img tool and QEMU system emulation. %package ui-curses Summary: Curses based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-curses @@ -689,6 +716,8 @@ This package contains a module for doing curses based UI for QEMU. %package ui-gtk Summary: GTK based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-gtk @@ -698,6 +727,8 @@ This package contains a module for doing GTK based UI for QEMU. %package ui-sdl Summary: SDL based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-sdl @@ -707,6 +738,8 @@ This package contains a module for doing SDL based UI for QEMU. %package audio-alsa Summary: ALSA based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-alsa @@ -715,6 +748,8 @@ This package contains a module for ALSA based audio support for QEMU. %package audio-oss Summary: OSS based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-oss @@ -723,6 +758,8 @@ This package contains a module for OSS based audio support for QEMU. %package audio-pa Summary: Pulse Audio based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-pa @@ -732,6 +769,8 @@ This package contains a module for Pulse Audio based audio support for QEMU. %package audio-sdl Summary: SDL based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-sdl @@ -741,6 +780,8 @@ This package contains a module for SDL based audio support for QEMU. %package tools Summary: Tools for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_libexecdir/qemu-bridge-helper Requires(pre): permissions Requires(pre): shadow @@ -756,6 +797,8 @@ a virtfs helper, ivshmem, disk utilities and scripts for various purposes. %package guest-agent Summary: Guest agent for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_bindir/qemu-ga Requires(pre): shadow Requires(post): udev @@ -824,6 +867,8 @@ network adapters available with QEMU. %package ksm Summary: Kernel Samepage Merging services Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires(pre): coreutils Requires(post): coreutils @@ -1409,17 +1454,16 @@ fi %_bindir/qemu-system-ppc %_bindir/qemu-system-ppc64 %_bindir/qemu-system-ppcemb -%_datadir/%name/ppc_rom.bin +%_datadir/%name/bamboo.dtb +%_datadir/%name/canyonlands.dtb %_datadir/%name/openbios-ppc +%_datadir/%name/ppc_rom.bin +%_datadir/%name/qemu_vga.ndrv +%_datadir/%name/skiboot.lid %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin %_datadir/%name/u-boot.e500 %_datadir/%name/u-boot-sam460-20100605.bin -%_datadir/%name/bamboo.dtb -%_datadir/%name/canyonlands.dtb -%_datadir/%name/petalogix-ml605.dtb -%_datadir/%name/skiboot.lid -%_datadir/%name/qemu_vga.ndrv %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-ppc %_docdir/qemu-ppc/supported.txt @@ -1471,9 +1515,10 @@ fi %_bindir/qemu-system-xtensa %_bindir/qemu-system-xtensaeb %_datadir/%name/hppa-firmware.img -%_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 +%_datadir/%name/palcode-clipper +%_datadir/%name/petalogix-ml605.dtb %_datadir/%name/petalogix-s3adsp1800.dtb %_datadir/%name/QEMU,cgthree.bin %_datadir/%name/QEMU,tcx.bin @@ -1594,15 +1639,15 @@ fi %dir %_datadir/%name %_datadir/%name/pxe-e1000.rom %_datadir/%name/pxe-eepro100.rom -%_datadir/%name/pxe-pcnet.rom %_datadir/%name/pxe-ne2k_pci.rom +%_datadir/%name/pxe-pcnet.rom %_datadir/%name/pxe-rtl8139.rom %_datadir/%name/pxe-virtio.rom %_datadir/%name/efi-e1000.rom %_datadir/%name/efi-e1000e.rom %_datadir/%name/efi-eepro100.rom -%_datadir/%name/efi-pcnet.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 diff --git a/qemu.spec.in b/qemu.spec.in index 63eb6373..9a4fde70 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -399,7 +399,7 @@ Recommends: qemu-ksm = %{qemuver} %endif %ifarch s390x -%define s390x_default_built_firmware {s390-ccw.img} +%define s390x_default_built_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_built_firmware {%nil} %endif @@ -447,6 +447,8 @@ This package acts as an umbrella package to the other QEMU sub-packages. %package x86 Summary: Machine emulator and virtualizer for x86 architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Requires: qemu-ipxe Requires: qemu-seabios @@ -467,6 +469,8 @@ This package provides i386 and x86_64 emulation. %package ppc Summary: Machine emulator and virtualizer for Power architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -483,6 +487,8 @@ This package provides ppc and ppc64 emulation. %package s390 Summary: Machine emulator and virtualizer for S/390 architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} %description s390 @@ -497,6 +503,8 @@ This package provides s390x emulation. %package arm Summary: Machine emulator and virtualizer for ARM architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -515,6 +523,8 @@ This package provides arm emulation. %package extra Summary: Machine emulator and virtualizer for "extra" architectures Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires: %name = %{qemuver} Recommends: qemu-ipxe Recommends: qemu-vgabios @@ -532,9 +542,10 @@ more popular QEMU packages which are dedicated to a single architecture.) %if %{legacy_qemu_kvm} %package kvm -Url: http://www.linux-kvm.org Summary: Wrapper to enable KVM acceleration under QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %ifarch %ix86 x86_64 Requires: qemu-x86 = %{qemuver} %endif @@ -560,6 +571,8 @@ is invoked. It provides no additional benefit, and is considered deprecated. %package lang Summary: Translations for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %description lang This package contains a few language translations, particularly for the @@ -580,6 +593,8 @@ Conflicts: qemu-tools > %{qemuver}-%{release} %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_libdir/%name/block-curl.so %{qemu_module_conflicts} @@ -590,6 +605,8 @@ a network connection from qemu-img tool and QEMU system emulation. %package block-dmg Summary: DMG block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-dmg @@ -600,6 +617,8 @@ qemu-img tool and QEMU system emulation. %package block-gluster Summary: GlusterFS block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-gluster @@ -611,6 +630,8 @@ GlusterFS network connection from qemu-img tool and QEMU system emulation. %package block-iscsi Summary: iSCSI block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-iscsi @@ -622,6 +643,8 @@ iSCSI network connection from qemu-img tool and QEMU system emulation. %package block-rbd Summary: Rados Block Device (Ceph) support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-rbd @@ -631,6 +654,8 @@ This package contains a module for accessing ceph (rbd,rados) image files. %package block-ssh Summary: SSH (SFTP) block support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description block-ssh @@ -640,6 +665,8 @@ SSH network connection from qemu-img tool and QEMU system emulation. %package ui-curses Summary: Curses based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-curses @@ -648,6 +675,8 @@ This package contains a module for doing curses based UI for QEMU. %package ui-gtk Summary: GTK based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-gtk @@ -657,6 +686,8 @@ This package contains a module for doing GTK based UI for QEMU. %package ui-sdl Summary: SDL based UI support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description ui-sdl @@ -666,6 +697,8 @@ This package contains a module for doing SDL based UI for QEMU. %package audio-alsa Summary: ALSA based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-alsa @@ -674,6 +707,8 @@ This package contains a module for ALSA based audio support for QEMU. %package audio-oss Summary: OSS based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-oss @@ -682,6 +717,8 @@ This package contains a module for OSS based audio support for QEMU. %package audio-pa Summary: Pulse Audio based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-pa @@ -691,6 +728,8 @@ This package contains a module for Pulse Audio based audio support for QEMU. %package audio-sdl Summary: SDL based audio support for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 %{qemu_module_conflicts} %description audio-sdl @@ -700,6 +739,8 @@ This package contains a module for SDL based audio support for QEMU. %package tools Summary: Tools for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_libexecdir/qemu-bridge-helper Requires(pre): permissions Requires(pre): shadow @@ -715,6 +756,8 @@ a virtfs helper, ivshmem, disk utilities and scripts for various purposes. %package guest-agent Summary: Guest agent for QEMU Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Provides: %name:%_bindir/qemu-ga Requires(pre): shadow Requires(post): udev @@ -783,6 +826,8 @@ network adapters available with QEMU. %package ksm Summary: Kernel Samepage Merging services Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 Requires(pre): coreutils Requires(post): coreutils @@ -1328,17 +1373,16 @@ fi %_bindir/qemu-system-ppc %_bindir/qemu-system-ppc64 %_bindir/qemu-system-ppcemb -%_datadir/%name/ppc_rom.bin +%_datadir/%name/bamboo.dtb +%_datadir/%name/canyonlands.dtb %_datadir/%name/openbios-ppc +%_datadir/%name/ppc_rom.bin +%_datadir/%name/qemu_vga.ndrv +%_datadir/%name/skiboot.lid %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin %_datadir/%name/u-boot.e500 %_datadir/%name/u-boot-sam460-20100605.bin -%_datadir/%name/bamboo.dtb -%_datadir/%name/canyonlands.dtb -%_datadir/%name/petalogix-ml605.dtb -%_datadir/%name/skiboot.lid -%_datadir/%name/qemu_vga.ndrv %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-ppc %_docdir/qemu-ppc/supported.txt @@ -1390,9 +1434,10 @@ fi %_bindir/qemu-system-xtensa %_bindir/qemu-system-xtensaeb %_datadir/%name/hppa-firmware.img -%_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 +%_datadir/%name/palcode-clipper +%_datadir/%name/petalogix-ml605.dtb %_datadir/%name/petalogix-s3adsp1800.dtb %_datadir/%name/QEMU,cgthree.bin %_datadir/%name/QEMU,tcx.bin @@ -1513,15 +1558,15 @@ fi %dir %_datadir/%name %_datadir/%name/pxe-e1000.rom %_datadir/%name/pxe-eepro100.rom -%_datadir/%name/pxe-pcnet.rom %_datadir/%name/pxe-ne2k_pci.rom +%_datadir/%name/pxe-pcnet.rom %_datadir/%name/pxe-rtl8139.rom %_datadir/%name/pxe-virtio.rom %_datadir/%name/efi-e1000.rom %_datadir/%name/efi-e1000e.rom %_datadir/%name/efi-eepro100.rom -%_datadir/%name/efi-pcnet.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