From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 19 Mar 2019 15:59:36 +0000 (+0000)
Subject: rpm: fix upgrades when RBD is disabled in a new version
X-Git-Tag: v5.2.0-rc1~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc65c22b73420ca2137baea7a8981d0b9f938cf1;p=thirdparty%2Flibvirt.git

rpm: fix upgrades when RBD is disabled in a new version

We previously had to disable RBD on 32-bit platforms since Ceph has
dropped all support for 32-bit. Unfortunately anyone with the RPM
libvirt-daemon-driver-storage-rbd installed on 32-bit now has a
broken upgrade path.

To fix this we must make libvirt-daemon-driver-storage-core
have an Obsoletes: libvirt-daemon-driver-storage-rbd < $VER-$REL

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1497cad3d2..79f3d31d19 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -550,6 +550,9 @@ Requires: util-linux
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
 %endif
+%if !%{with_storage_rbd}
+Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release}
+%endif
 
 %description daemon-driver-storage-core
 The storage driver plugin for the libvirtd daemon, providing