diff --git a/.gitignore b/.gitignore
index 171935d..9f97fd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20200529.tar.xz
+SOURCES/osinfo-db-20200804.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 9449b4e..cd71895 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-f35431aa1f569927c689d3d827cdd385062d3246 SOURCES/osinfo-db-20200529.tar.xz
+17303d28e1aaefc37e71920a69e1872a37319869 SOURCES/osinfo-db-20200804.tar.xz
diff --git a/SOURCES/0001-rhel-Add-8.3-entry.patch b/SOURCES/0001-rhel-Add-8.3-entry.patch
index 1d4a66e..2e7c867 100644
--- a/SOURCES/0001-rhel-Add-8.3-entry.patch
+++ b/SOURCES/0001-rhel-Add-8.3-entry.patch
@@ -1,20 +1,23 @@
-From d01d95487589da131e125c7af251ec193b80c707 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Sun, 31 May 2020 14:20:28 +0100
+From 6bf4cdcf52a55263c6d6f2ea63873fd497fc5b54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Tue, 4 Aug 2020 23:29:53 +0200
Subject: [PATCH] rhel: Add 8.3 entry
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-Signed-off-by: rpm-build <rpm-build>
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
- os/redhat.com/rhel-8-unknown.xml | 20 ++---
- os/redhat.com/rhel-8.3.xml | 134 +++++++++++++++++++++++++++++++
- 2 files changed, 144 insertions(+), 10 deletions(-)
+ os/redhat.com/rhel-8-unknown.xml | 20 ++--
+ os/redhat.com/rhel-8.3.xml | 165 +++++++++++++++++++++++++++++++
+ 2 files changed, 175 insertions(+), 10 deletions(-)
create mode 100644 os/redhat.com/rhel-8.3.xml
diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
-index 66afe5a..8094635 100644
+index b7f0ba2..dc9941d 100644
--- a/os/redhat.com/rhel-8-unknown.xml
+++ b/os/redhat.com/rhel-8-unknown.xml
-@@ -25,13 +25,13 @@
+@@ -28,12 +28,12 @@
<family>linux</family>
<distro>rhel</distro>
<codename>Ootpa</codename>
@@ -22,7 +25,6 @@ index 66afe5a..8094635 100644
- <derives-from id="http://redhat.com/rhel/8.2"/>
+ <upgrades id="http://redhat.com/rhel/8.3"/>
+ <derives-from id="http://redhat.com/rhel/8.3"/>
-
<media arch="x86_64">
<iso>
<system-id>LINUX</system-id>
@@ -31,31 +33,28 @@ index 66afe5a..8094635 100644
</iso>
<kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd>
-@@ -40,28 +40,28 @@
+@@ -41,46 +41,46 @@
<media arch="aarch64">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+ <volume-id>RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
- </iso>
- </media>
-
+ <iso>
+ <system-id>LINUX</system-id>
+- <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
++ <volume-id>RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ </iso>
+ </media>
<media arch="ppc64le">
- <iso>
- <system-id>PPC</system-id>
-- <volume-id>RHEL[_-]8[_-]([3-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+ <volume-id>RHEL[_-]8[_-]([4-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
- </iso>
- </media>
-
+ <iso>
+ <system-id>PPC</system-id>
+- <volume-id>RHEL[_-]8[_-]([3-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
++ <volume-id>RHEL[_-]8[_-]([4-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ </iso>
+ </media>
<media arch="s390x">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+ <volume-id>RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
- </iso>
- </media>
-
+ <iso>
+ <system-id>LINUX</system-id>
+- <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
++ <volume-id>RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ </iso>
+ </media>
<tree arch="aarch64">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
@@ -64,7 +63,6 @@ index 66afe5a..8094635 100644
<arch>aarch64</arch>
</treeinfo>
</tree>
-@@ -69,7 +69,7 @@
<tree arch="ppc64le">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
@@ -73,7 +71,6 @@ index 66afe5a..8094635 100644
<arch>ppc64le</arch>
</treeinfo>
</tree>
-@@ -77,7 +77,7 @@
<tree arch="s390x">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
@@ -82,7 +79,6 @@ index 66afe5a..8094635 100644
<arch>s390x</arch>
</treeinfo>
</tree>
-@@ -85,7 +85,7 @@
<tree arch="x86_64">
<treeinfo>
<family>Red Hat Enterprise Linux</family>
@@ -93,36 +89,35 @@ index 66afe5a..8094635 100644
</tree>
diff --git a/os/redhat.com/rhel-8.3.xml b/os/redhat.com/rhel-8.3.xml
new file mode 100644
-index 0000000..6427990
+index 0000000..b0ed3fe
--- /dev/null
+++ b/os/redhat.com/rhel-8.3.xml
-@@ -0,0 +1,134 @@
-+<?xml version="1.0" encoding="UTF-8"?>
+@@ -0,0 +1,165 @@
++<?xml version="1.0"?>
+<libosinfo version="0.0.1">
-+
++ <!-- Licensed under the GNU General Public License version 2 or later.
++ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://redhat.com/rhel/8.3">
+ <short-id>rhel8.3</short-id>
+ <name>Red Hat Enterprise Linux 8.3</name>
+ <version>8.3</version>
+ <vendor>Red Hat, Inc</vendor>
-+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
-+ <vendor xml:lang="de">Red Hat, Inc</vendor>
-+ <vendor xml:lang="es">Red Hat, Inc</vendor>
-+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
-+ <vendor xml:lang="id">Red Hat, Inc</vendor>
-+ <vendor xml:lang="it">Red Hat, Inc</vendor>
-+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
-+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
-+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
++ <vendor xml:lang="tr">Red Hat, Inc</vendor>
++ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
++ <vendor xml:lang="pl">Red Hat, Inc</vendor>
++ <vendor xml:lang="ja">Red Hat, Inc</vendor>
++ <vendor xml:lang="it">Red Hat, Inc</vendor>
++ <vendor xml:lang="id">Red Hat, Inc</vendor>
++ <vendor xml:lang="fr">Red Hat, Inc</vendor>
++ <vendor xml:lang="es">Red Hat, Inc</vendor>
++ <vendor xml:lang="de">Red Hat, Inc</vendor>
++ <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <codename>Ootpa</codename>
+ <upgrades id="http://redhat.com/rhel/8.2"/>
+ <derives-from id="http://redhat.com/rhel/8.2"/>
-+
-+ <release-date>2020-11-03</release-date>
-+
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
@@ -131,7 +126,6 @@ index 0000000..6427990
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
-+
+ <media arch="ppc64le">
+ <iso>
+ <system-id>PPC</system-id>
@@ -140,21 +134,18 @@ index 0000000..6427990
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
-+
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-3-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso>
+ </media>
-+
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>RHEL-8-3-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso>
+ </media>
-+
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
@@ -162,7 +153,6 @@ index 0000000..6427990
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
-+
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
@@ -170,7 +160,6 @@ index 0000000..6427990
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
-+
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
@@ -178,7 +167,6 @@ index 0000000..6427990
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
-+
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
@@ -186,7 +174,6 @@ index 0000000..6427990
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
-+
+ <resources arch="ppc64le">
+ <minimum>
+ <n-cpus>1</n-cpus>
@@ -194,44 +181,83 @@ index 0000000..6427990
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
-+
+ <recommended>
+ <cpu>4000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
++ <maximum>
++ <n-cpus>768</n-cpus>
++ <ram>35184372088832</ram>
++ </maximum>
+ </resources>
-+
-+ <resources arch="all">
++ <resources arch="x86_64">
+ <minimum>
-+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
-+
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
-+
+ <maximum>
++ <n-cpus>768</n-cpus>
+ <ram>26388279066624</ram>
+ </maximum>
-+
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources>
-+
++ <resources arch="s390x">
++ <minimum>
++ <ram>1073741824</ram>
++ <storage>10737418240</storage>
++ </minimum>
++ <recommended>
++ <storage>21474836480</storage>
++ </recommended>
++ <maximum>
++ <n-cpus>340</n-cpus>
++ <ram>17592186044416</ram>
++ </maximum>
++ <network-install>
++ <ram>2147483648</ram>
++ </network-install>
++ </resources>
++ <resources arch="aarch64">
++ <minimum>
++ <ram>2147483648</ram>
++ <storage>10737418240</storage>
++ </minimum>
++ <recommended>
++ <storage>21474836480</storage>
++ </recommended>
++ <maximum>
++ <n-cpus>256</n-cpus>
++ <ram>1649267441664</ram>
++ </maximum>
++ </resources>
++ <resources arch="all">
++ <minimum>
++ <n-cpus>1</n-cpus>
++ <cpu>1000000000</cpu>
++ <ram>1610612736</ram>
++ <storage>10737418240</storage>
++ </minimum>
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>1610612736</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </resources>
+ <installer>
-+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
-+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
++ <script id="http://redhat.com/rhel/kickstart/jeos"/>
++ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
-\ No newline at end of file
--
2.26.2
diff --git a/SOURCES/osinfo-db-20200529.tar.xz.asc b/SOURCES/osinfo-db-20200529.tar.xz.asc
deleted file mode 100644
index 1f29394..0000000
--- a/SOURCES/osinfo-db-20200529.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl7Q7ScACgkQ7pJsK9rM
-F3vzHg/+McMah8hK1ZvG/l8OQe11j0mEmbyif5quWbJ8h+OY+muUcdhZUIPLa6vN
-KjhwFYrN6TJI+LpopODv/rbU1r7JSOyp3iYh3s3og4N/nQiovMPdMeTdP4EImMZl
-3/IcmNuAyFgM+CsKAJQu89zI0izA5wRCR/WrJ+W9erTPymEHYYMz2zH7w2CGn7Dn
-UqBRLgGWQFQgE2VQabomiYAsvMoFvzs5UDLRodR62vkY4q4EGjMfiIRiHyzSzAmp
-qXqd8R00eewrRmu+hDw8XqL85otqt9himuYUP+SuEhlsfGpzApnlRt8xe8wLv0dQ
-hgd+uxvWoM51Ychv7T4wjvN1EIw1XbvxpybPHH1FdgRe6dCrzu5hu9eRDyfZIvgg
-Jeqbwr0RmaTb7c2ntlRVdT/ezlHwDezStgohSusBWOrdb+7+ky5X9AeP3I1A2m9F
-t268PSoPwIgCXIo7+84QlmJdChtqe/dvWkb430pi08fuPcuf0WMGgThsXuyLeEqd
-lNfvy0ry+pe10MrNPZKOXUk+K6e09NirKN2fGbayit6Tzyyhi8FL7N2xhH44efBF
-AFuvsdtQuB7ORFQtK0/0/0Hu0uHqzXLn5cfY6r4H99kvwmnq9z8K3/Rt7J0Y2PRD
-e4LqOhK9QNVlKbM930AEwrutOsLuUAgF/DaQZxRZJBTHFNkjYH0=
-=sxzz
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20200804.tar.xz.asc b/SOURCES/osinfo-db-20200804.tar.xz.asc
new file mode 100644
index 0000000..f919fe0
--- /dev/null
+++ b/SOURCES/osinfo-db-20200804.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl8py6oACgkQ7pJsK9rM
+F3ul7xAAhHgPVJClx9bw6npz3JkEMoxfVNTSBbbs/qEhrtSB5a3YdWhltvfUL64V
+sOUZC6wZobU3P08lX3WW1C+A2v2IVTvME/5P/MX4PAtqZK+RQGo0oTKXN85+qAko
+7qWnG3ks/Cq7drH+0rchO4K3uB5OLOWbpXufT8qIWUaENqXRN5Bwobz9PDtSXYcz
+4RDnCZCygsrhdTujg/5KT7D9WfDXw99s5dGrSs7RVKZ1KH073atsh3NDPz9hTyZn
+ktQddOYJ8Wrk1yTeVC5uMkSFsaJj3s2oewfi6kP1uW9m+RDgnXpydSZ5Hke7TrFF
+Kav5odgHkFwQXonLAnargIHP8MuIgwJPAN9LkdecFeY0kLRNB1VhMDJ6NzOgNYJ3
+ST2dsJUU4C3Ak1jbycNywEJ+ZHYJPWTBuhV8nqZgVNQrbKGia0LaOgJXjDY1PrIW
+5iErJFBepE3vB25cKRFANaxkoJ7QK6nqQkVQ3T9KwfwdRdEfrBPponHMeCZEga8T
+8EYlbcNi57bktHc6K9EIwvSEoEG8UwpE2vjnikK6zmOdhT9xoX35/6RD28ZvwkmZ
+QTtMwe2nT4Q+EBDJbrunKYFP3jU5j6Fhod0aCjNIsPHpn9jip1txAcr9RgWtHAmI
+qoYHB5oXQT2cYCsx9kzS5lpYyTjMWh3m3GWoOI0N+Ot6VDc8dU4=
+=ec1v
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 03e0c56..3735338 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -4,8 +4,8 @@
Summary: osinfo database files
Name: osinfo-db
-Version: 20200529
-Release: 1%{?dist}
+Version: 20200804
+Release: 2%{?dist}
License: LGPLv2+
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
@@ -59,6 +59,14 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema
%changelog
+* Tue Aug 04 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200804-2
+- Remove duplicated virtio1.0-fs device
+- Related: rhbz#1837756 - osinfo-db is out of date
+
+* Tue Aug 04 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200804-1
+- Update to v20200804 release
+- Related: rhbz#1837756 - osinfo-db is out of date
+
* Sun May 31 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200529-1
- Update to v20200529 release
- Resolves: rhbz#1837756 - osinfo-db is out of date