From 522a8f6bdbbc532c64c9e12ebe4b8e6b943661d1 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Tue, 1 Mar 2022 05:45:09 -0500
Subject: [PATCH] * Tue Mar 01 2022 Miroslav Rezanina <mrezanin@redhat.com> -
 6.2.0-11 - kvm-spec-Remove-qemu-virtiofsd.patch [bz#2055284] - Resolves:
 bz#2055284   (Remove the qemu-virtiofsd subpackage)

---
 qemu-kvm.spec   | 28 ++++++++++------------------
 rpminspect.yaml |  2 +-
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/qemu-kvm.spec b/qemu-kvm.spec
index 55c53a7..2d4f8e0 100644
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@@ -144,7 +144,7 @@ Obsoletes: %{name}-block-iscsi <= %{version}                    \
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 6.2.0
-Release: 10%{?rcrel}%{?dist}%{?cc_suffix}
+Release: 11%{?rcrel}%{?dist}%{?cc_suffix}
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 # Epoch 15 used for RHEL 8
 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5)
@@ -443,15 +443,6 @@ This package provides the qemu-pr-helper utility that is required for certain
 SCSI features. 
 
 
-%package -n qemu-virtiofsd
-Summary: QEMU virtio-fs shared file system daemon
-Provides: virtiofsd
-%description -n qemu-virtiofsd
-This package provides virtiofsd daemon. This program is a vhost-user backend
-that implements the virtio-fs device that is used for sharing a host directory
-tree with a guest.
-
-
 %package -n qemu-img
 Summary: QEMU command line tool for manipulating disk images
 %description -n qemu-img
@@ -1109,6 +1100,10 @@ rm -rf %{buildroot}%{_datadir}/%{name}/vgabios*bin
 rm -rf %{buildroot}%{_datadir}/%{name}/bios*.bin
 rm -rf %{buildroot}%{_datadir}/%{name}/sgabios.bin
 
+# Remove virtiofsd (we use separate package for virtiofsd)
+rm -rf %{buildroot}%{_mandir}/man1/virtiofsd.1*
+rm -rf %{buildroot}%{_libexecdir}/virtiofsd
+rm -rf %{buildroot}%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
 
 %if %{have_modules_load}
     install -D -p -m 644 %{_sourcedir}/modules-load.conf %{buildroot}%{_sysconfdir}/modules-load.d/kvm.conf
@@ -1222,14 +1217,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_unitdir}/qemu-pr-helper.socket
 %{_mandir}/man8/qemu-pr-helper.8*
 
-%files -n qemu-virtiofsd
-%{_mandir}/man1/virtiofsd.1*
-%{_libexecdir}/virtiofsd
-# This is the standard location for vhost-user JSON files defined in the
-# vhost-user specification for interoperability with other software. Unlike
-# most other paths we use it's "qemu" instead of "qemu-kvm".
-%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
-
 %files docs
 %doc %{qemudocdir}
 
@@ -1337,6 +1324,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %endif
 
 %changelog
+* Tue Mar 01 2022 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-11
+- kvm-spec-Remove-qemu-virtiofsd.patch [bz#2055284]
+- Resolves: bz#2055284
+  (Remove the qemu-virtiofsd subpackage)
+
 * Thu Feb 24 2022 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-10
 - kvm-Revert-ui-clipboard-Don-t-use-g_autoptr-just-to-free.patch [bz#2042820]
 - kvm-ui-avoid-compiler-warnings-from-unused-clipboard-inf.patch [bz#2042820]
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 2cc100e..16aec7d 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -7,4 +7,4 @@ annocheck:
         - hardened: --skip-cf-protection --skip-property-note --ignore-unknown --verbose
         ignore:
                 - /usr/share/qemu-kvm/s390-ccw.img
-                - /usr/share/qemu-kvm/s390-netboot.img on s390x
+                - /usr/share/qemu-kvm/s390-netboot.img