#33 Fix the upgrade path for qemu-virtiofsd on i686, and cleanup some cruft
Merged a year ago by berrange. Opened a year ago by berrange.
rpms/ berrange/qemu fix-virtiofs  into  rawhide

file modified
+11 -5
@@ -218,7 +218,13 @@ 

  %define requires_device_display_virtio_vga Requires: %{name}-device-display-virtio-vga = %{evr}

  %define requires_device_display_virtio_vga_gl Requires: %{name}-device-display-virtio-vga-gl = %{evr}

  %define requires_package_qemu_pr_helper Requires: qemu-pr-helper

+ %ifnarch %{ix86}

  %define requires_package_virtiofsd Requires: vhostuser-backend(fs)

+ %define obsoletes_package_virtiofsd %{nil}

+ %else

+ %define requires_package_virtiofsd %{nil}

+ %define obsoletes_package_virtiofsd Obsoletes: %{name}-virtiofsd < %{evr}

+ %endif

  

  %if %{have_virgl}

  %define requires_device_display_vhost_user_gpu Requires: %{name}-device-display-vhost-user-gpu = %{evr}
@@ -305,7 +311,7 @@ 

  %global obsoletes_some_modules \

  %{obsoletes_block_gluster} \

  %{obsoletes_block_rbd} \

- %{obsoletes_block_rbd} \

+ %{obsoletes_package_virtiofsd} \

  Obsoletes: %{name}-system-lm32 <= %{epoch}:%{version}-%{release} \

  Obsoletes: %{name}-system-lm32-core <= %{epoch}:%{version}-%{release} \

  Obsoletes: %{name}-system-moxie <= %{epoch}:%{version}-%{release} \
@@ -321,7 +327,7 @@ 

  %endif

  

  # To prevent rpmdev-bumpspec breakage

- %global baserelease 1

+ %global baserelease 2

  

  Summary: QEMU is a FAST! processor emulator

  Name: qemu
@@ -1718,14 +1724,12 @@ 

  %if %{have_block_nfs}

    --enable-libnfs \

  %endif

-   --enable-libudev \

  %if %{have_liburing}

    --enable-linux-io-uring \

  %endif

    --enable-linux-user \

    --enable-live-block-migration \

    --enable-multiprocess \

-   --enable-vnc-jpeg \

    --enable-parallels \

  %if %{have_librdma}

    --enable-pvrdma \
@@ -1745,7 +1749,6 @@ 

    --enable-spice \

    --enable-spice-protocol \

  %endif

-   --enable-usb-redir \

    --enable-vdi \

    --enable-vhost-crypto \

  %if %{have_virgl}
@@ -2770,6 +2773,9 @@ 

  

  

  %changelog

+ * Tue Apr 25 2023 Daniel P. Berrangé <berrange@redhat.com> - 8.0.0-2

+ - Obsolete qemu-virtiofsd on i686 (rhbz #2189368)

+ 

  * Thu Apr 20 2023 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 8.0.0-1

  - Rebase to qemu 8.0.0

  

Commits look fine to me. Personally I might have mentioned the other changes in the %changelog, but I guess they are internal mistake-fixing, so could be irrelevant to the readers of the changelog.

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/17d50a4d997b47318b25a3e9c9a6587b

3 new commits added

  • Obsolete qemu-virtiofsd on x86 arch
  • Remove duplicated obsoletes for RBD package
  • Remove repeated configure options
a year ago

Doh first version had the arch check inverted, so obsoleted virtiofs on non-i686 :-)

Pull-Request has been merged by berrange

a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/66ff3d6afcb8469d9b9eddb7476b5350

Metadata