From fcc05136eea1b5e4ebc9bfe18e6ffeda17cd8f26 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 9 May 2023 17:23:12 +0200 Subject: [PATCH] Only use Obsolete/Provides on Fedora 39 and later The previous commit added Obsolete/Provides entries to ensure an easy transition from qemu-virtiofsd to virtiofsd when users update to Fedora 39 from previous versions. We don't want this entries in previous versions, as it may trigger an unnecessary switch between those packages. To avoid having divergent branches between rawhide and older versions, put them behind a "if 0%{?fedora} > 38" conditional. Suggested-by: Adam Williamson Signed-off-by: Sergio Lopez --- virtiofsd.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/virtiofsd.spec b/virtiofsd.spec index a94b4bc..3da8ab1 100644 --- a/virtiofsd.spec +++ b/virtiofsd.spec @@ -1,6 +1,6 @@ Name: virtiofsd Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtio-fs vhost-user device daemon (Rust version) # Upstream license specification: Apache-2.0 AND BSD-3-Clause @@ -19,8 +19,10 @@ BuildRequires: libseccomp-devel Requires: qemu-common Provides: vhostuser-backend(fs) Conflicts: qemu-virtiofsd +%if 0%{?fedora} > 38 Obsoletes: qemu-virtiofsd <= 2:8.0.0-1 Provides: qemu-virtiofsd = 2:7.2.1-1 +%endif %description %{summary}. @@ -47,6 +49,9 @@ install -D -p -m 0644 50-qemu-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost- %{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json %changelog +* Tue May 09 2023 Sergio Lopez - 1.5.1-3 +- Only use Obsoletes/Provides on Fedora 39 and later + * Wed Apr 26 2023 Daniel P. Berrangé - 1.5.1-2 - Add Obsoletes/Provides for qemu-virtiofsd to get an upgrade path (rhbz #2189368)