From 0d2457f5c8bb4b295cceb4ece7091dff6bc17e22 Mon Sep 17 00:00:00 2001
From: Sergio Lopez <slp@redhat.com>
Date: Fri, 28 Jan 2022 13:16:14 +0100
Subject: [PATCH] Remove Windows binaries and declare the conflict with
 qemu-virtiofsd

Also, remove the explicit library dependencies and remove the useless
"Provides: virtiofsd".

Resolves: rhbz#2022710
Signed-off-by: Sergio Lopez <slp@redhat.com>
---
 sources        |  2 +-
 virtiofsd.spec | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sources b/sources
index 8b53ca6..ef676b3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virtiofsd-1.1.0-vendor.tar.gz) = d23610ccf2b6310b45f1ef074cf390a3ba25c4a22ec555280f85875a7b02169617d4087a69e213eb8ecde8180ac8c22b50da8f8fe5cff267f1309e1ccf703816
 SHA512 (virtiofsd-1.1.0.crate) = c0c2679e0d878081b01b44adbebe8decffb96507643d7ab73f5346bec3456191b24d7d7e3917d6f6da3cf8467f1bd40c1043706b1c20da99947eb00e301d7dde
+SHA512 (virtiofsd-1.1.0-vendor.tar.gz) = 7ad646201115abe57b9595ea4fb0b2262daba33ed166cd0a9efb215cb27ef09e800ea3e8fabf880d4a0d7a3e53deea336f350d6b020772f42fe8588edf0d300f
diff --git a/virtiofsd.spec b/virtiofsd.spec
index 57d2c7f..c5c100b 100644
--- a/virtiofsd.spec
+++ b/virtiofsd.spec
@@ -1,6 +1,6 @@
 Name:           virtiofsd
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Virtio-fs vhost-user device daemon (Rust version)
 
 # Upstream license specification: Apache-2.0 AND BSD-3-Clause
@@ -13,10 +13,9 @@ ExclusiveArch:  x86_64 aarch64 s390x
 BuildRequires:  rust-toolset
 BuildRequires:  libcap-ng-devel
 BuildRequires:  libseccomp-devel
-Requires: libcap-ng
-Requires: libseccomp
-Provides: virtiofsd
 Obsoletes: qemu-virtiofsd = 17:6.2.0
+# Both qemu-virtiofsd and virtiofsd ship the same binary
+Conflicts: qemu-virtiofsd = 17:6.2.0
 
 %description
 %{summary}.
@@ -41,6 +40,12 @@ install -D -p -m 0644 50-qemu-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost-
 %{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
 
 %changelog
+* Fri Jan 28 2022 Sergio Lopez <slp@redhat.com> - 1.1.0-2
+- Explicitly declare the conflict with qemu-virtiofsd
+- Remove explicit library dependencies
+- Remove useless "Provides: virtiosfd"
+- Remove Windows binaries from vendor tarball
+
 * Thu Jan 27 2022 Sergio Lopez <slp@redhat.com> - 1.1.0-1
 - Initial package