From 6f8231b1f9d4339bbf511014d70c2b95b66567ab Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 4 Feb 2021 08:59:31 +0000
Subject: [PATCH] Increase release so > RHEL 8 (RHBZ#1924966). Unify spec files
 between RHEL and Fedora.

---
 ...ax-virtio-requirement-in-config-file.patch | 42 +++++++++++++++++++
 vhostmd.spec                                  | 18 +++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 0001-Relax-virtio-requirement-in-config-file.patch

diff --git a/0001-Relax-virtio-requirement-in-config-file.patch b/0001-Relax-virtio-requirement-in-config-file.patch
new file mode 100644
index 0000000..5f49e4c
--- /dev/null
+++ b/0001-Relax-virtio-requirement-in-config-file.patch
@@ -0,0 +1,42 @@
+From 83cc269f6892852be94467cea771b3ad1da8a369 Mon Sep 17 00:00:00 2001
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Tue, 8 Oct 2019 20:56:18 -0600
+Subject: [PATCH] Relax virtio requirement in config file
+
+When the virtio transport was introduced the schema was changed to
+require a <virtio> transport in vhostmd.conf. When updating existing
+deployments without a virtio transport specified in vhostmd.conf,
+vhostmd fails to start
+
+/usr/sbin/vhostmd -d
+/etc/vhostmd/vhostmd.conf:41: element globals: validity error : Element
+globals content does not follow the DTD, expecting (disk , virtio ,
+update_period , path , transport+), got (disk update_period path transport )
+validate_config_file(): Failed to validate :/etc/vhostmd/vhostmd.conf
+Config file: /etc/vhostmd/vhostmd.conf, fails DTD validation
+
+Relax the requirement for virtio transport in the schema. With the
+introduction of multiple transports perhaps the others shoud be optional
+as well, but requiring virtio is clearly a regression.
+
+Signed-off-by: Jim Fehlig <jfehlig@suse.com>
+---
+ vhostmd.dtd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vhostmd.dtd b/vhostmd.dtd
+index db417fd..888270e 100644
+--- a/vhostmd.dtd
++++ b/vhostmd.dtd
+@@ -9,7 +9,7 @@ Virtual Host Metrics Daemon (vhostmd). Configuration file DTD
+ -->
+ 
+ <!ELEMENT vhostmd (globals,metrics)>
+-<!ELEMENT globals (disk,virtio,update_period,path,transport+)>
++<!ELEMENT globals (disk,virtio*,update_period,path,transport+)>
+ 
+ <!ELEMENT disk (name,path,size)>
+ <!ELEMENT name (#PCDATA)>
+-- 
+2.24.1
+
diff --git a/vhostmd.spec b/vhostmd.spec
index 13b5f13..6603a65 100644
--- a/vhostmd.spec
+++ b/vhostmd.spec
@@ -3,14 +3,19 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       1.1
-Release:       4%{?dist}
+Release:       6%{?dist}
 License:       GPLv2+
 
-URL:           http://gitorious.org/vhostmd
+URL:           https://github.com/vhostmd/vhostmd
 
 Source0:       https://github.com/vhostmd/vhostmd/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:       vhostmd.conf
 
+# Prevents updates from previous versions with the old config file
+# from breaking (RHBZ#1782897).
+# https://github.com/vhostmd/vhostmd/commit/83cc269f6892852be94467cea771b3ad1da8a369
+Patch1:        0001-Relax-virtio-requirement-in-config-file.patch
+
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: chrpath
@@ -27,6 +32,11 @@ BuildRequires: systemd
 BuildRequires: xen-devel
 %endif
 
+# This is hopefully temporary, but required to run vhostmd.xml as
+# currently written.  For more information see:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1897130
+Requires:      libvirt
+
 
 %description 
 vhostmd provides a "metrics communication channel" between a host and
@@ -153,6 +163,10 @@ exit 0
 
 
 %changelog
+* Thu Feb 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1-6
+- Increase release so > RHEL 8 (RHBZ#1924966).
+- Unify spec files between RHEL and Fedora.
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild