diff --git a/.gitignore b/.gitignore
index 86daa0b..171935d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20200203.tar.xz
+SOURCES/osinfo-db-20200529.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 58681f2..9449b4e 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-07a02df203465ea2c8c64aa989d9552415c6e853 SOURCES/osinfo-db-20200203.tar.xz
+f35431aa1f569927c689d3d827cdd385062d3246 SOURCES/osinfo-db-20200529.tar.xz
diff --git a/SOURCES/0001-rhel-Add-7.8-entry.patch b/SOURCES/0001-rhel-Add-7.8-entry.patch
deleted file mode 100644
index e7b4e56..0000000
--- a/SOURCES/0001-rhel-Add-7.8-entry.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From 0db41559bbf1a7ed0985e423f0effddbadb28375 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 10 Dec 2019 10:12:55 +0100
-Subject: [PATCH] rhel: Add 7.8 entry
-
-Signed-off-by: rpm-build <rpm-build>
----
- os/redhat.com/rhel-7-unknown.xml | 22 ++---
- os/redhat.com/rhel-7.8.xml | 154 +++++++++++++++++++++++++++++++
- 2 files changed, 165 insertions(+), 11 deletions(-)
- create mode 100644 os/redhat.com/rhel-7.8.xml
-
-diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml
-index db2b59f..36f7dc9 100644
---- a/os/redhat.com/rhel-7-unknown.xml
-+++ b/os/redhat.com/rhel-7-unknown.xml
-@@ -19,13 +19,13 @@
- <family>linux</family>
- <distro>rhel</distro>
- <codename>Maipo</codename>
-- <upgrades id="http://redhat.com/rhel/7.7"/>
-- <derives-from id="http://redhat.com/rhel/7.7"/>
-+ <upgrades id="http://redhat.com/rhel/7.8"/>
-+ <derives-from id="http://redhat.com/rhel/7.8"/>
-
- <media arch="x86_64">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>.*RHEL-7.([89]|[1-9][0-9]).*x86_64.*</volume-id>
-+ <volume-id>.*RHEL-7.(9|[1-9][0-9]).*x86_64.*</volume-id>
- </iso>
- <kernel>isolinux/vmlinuz</kernel>
- <initrd>isolinux/initrd.img</initrd>
-@@ -34,35 +34,35 @@
- <media arch="aarch64">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>RHEL-7.([89]|[1-9][0-9]).*aarch64$</volume-id>
-+ <volume-id>RHEL-7.(9|[1-9][0-9]).*aarch64$</volume-id>
- </iso>
- </media>
-
- <media arch="ppc64">
- <iso>
- <system-id>PPC</system-id>
-- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$</volume-id>
-+ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64$</volume-id>
- </iso>
- </media>
-
- <media arch="ppc64le">
- <iso>
- <system-id>PPC</system-id>
-- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$</volume-id>
-+ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64le$</volume-id>
- </iso>
- </media>
-
- <media arch="s390x">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>RHEL-7.([89]|[1-9][0-9]).*s390x$</volume-id>
-+ <volume-id>RHEL-7.(9|[1-9][0-9]).*s390x$</volume-id>
- </iso>
- </media>
-
- <tree arch="ppc64">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^7.([89]|[1-9][0-9])$</version>
-+ <version>^7.(9|[1-9][0-9])$</version>
- <arch>ppc64</arch>
- </treeinfo>
- </tree>
-@@ -70,7 +70,7 @@
- <tree arch="ppc64le">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^7.([89]|[1-9][0-9])$</version>
-+ <version>^7.(9|[1-9][0-9])$</version>
- <arch>ppc64le</arch>
- </treeinfo>
- </tree>
-@@ -78,7 +78,7 @@
- <tree arch="s390x">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^7.([89]|[1-9][0-9])$</version>
-+ <version>^7.(9|[1-9][0-9])$</version>
- <arch>s390x</arch>
- </treeinfo>
- </tree>
-@@ -86,7 +86,7 @@
- <tree arch="x86_64">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^7.([89]|[1-9][0-9])$</version>
-+ <version>^7.(9|[1-9][0-9])$</version>
- <arch>x86_64</arch>
- </treeinfo>
- </tree>
-diff --git a/os/redhat.com/rhel-7.8.xml b/os/redhat.com/rhel-7.8.xml
-new file mode 100644
-index 0000000..d658600
---- /dev/null
-+++ b/os/redhat.com/rhel-7.8.xml
-@@ -0,0 +1,154 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="http://redhat.com/rhel/7.8">
-+ <short-id>rhel7.8</short-id>
-+ <name>Red Hat Enterprise Linux 7.8</name>
-+ <version>7.8</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>
-+ <family>linux</family>
-+ <distro>rhel</distro>
-+ <codename>Maipo</codename>
-+ <upgrades id="http://redhat.com/rhel/7.7"/>
-+ <derives-from id="http://redhat.com/rhel/7.7"/>
-+
-+ <release-date>2020-03-31</release-date>
-+
-+ <media arch="x86_64">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>.*RHEL-7.8.*x86_64.*</volume-id>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+ <media arch="aarch64">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>RHEL-7.8.*aarch64$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <media arch="ppc64">
-+ <iso>
-+ <system-id>PPC</system-id>
-+ <volume-id>RHEL[-_]7.8.*ppc64$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <media arch="ppc64le">
-+ <iso>
-+ <system-id>PPC</system-id>
-+ <volume-id>RHEL[-_]7.8.*ppc64le$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <media arch="s390x">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>RHEL-7.8.*s390x$</volume-id>
-+ </iso>
-+ </media>
-+
-+ <tree arch="ppc64">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux$</family>
-+ <version>^7.8$</version>
-+ <arch>ppc64$</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <tree arch="ppc64le">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux$</family>
-+ <version>^7.8$</version>
-+ <arch>ppc64le</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <tree arch="s390x">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux$</family>
-+ <version>^7.8$</version>
-+ <arch>s390x</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <tree arch="x86_64">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux$</family>
-+ <version>^7.8$</version>
-+ <arch>x86_64</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <resources arch="ppc64">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>4000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </resources>
-+
-+ <resources arch="ppc64le">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>4000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </resources>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>1000000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+
-+ <maximum>
-+ <ram>13194139533312</ram>
-+ </maximum>
-+
-+ <network-install>
-+ <ram>1610612736</ram>
-+ </network-install>
-+ </resources>
-+
-+ <installer>
-+ <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.23.0
-
diff --git a/SOURCES/0001-rhel-Add-8.3-entry.patch b/SOURCES/0001-rhel-Add-8.3-entry.patch
new file mode 100644
index 0000000..1d4a66e
--- /dev/null
+++ b/SOURCES/0001-rhel-Add-8.3-entry.patch
@@ -0,0 +1,237 @@
+From d01d95487589da131e125c7af251ec193b80c707 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sun, 31 May 2020 14:20:28 +0100
+Subject: [PATCH] rhel: Add 8.3 entry
+
+Signed-off-by: rpm-build <rpm-build>
+---
+ os/redhat.com/rhel-8-unknown.xml | 20 ++---
+ os/redhat.com/rhel-8.3.xml | 134 +++++++++++++++++++++++++++++++
+ 2 files changed, 144 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
+--- a/os/redhat.com/rhel-8-unknown.xml
++++ b/os/redhat.com/rhel-8-unknown.xml
+@@ -25,13 +25,13 @@
+ <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"/>
++ <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>
+- <volume-id>.*RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
++ <volume-id>.*RHEL-8-([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+@@ -40,28 +40,28 @@
+ <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>
+
+ <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>
+
+ <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>
+
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+- <version>^8.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
++ <version>^8.([4-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+@@ -69,7 +69,7 @@
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+- <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++ <version>^8.([4-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+@@ -77,7 +77,7 @@
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+- <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++ <version>^8.([4-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+@@ -85,7 +85,7 @@
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+- <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++ <version>^8.([4-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </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
+--- /dev/null
++++ b/os/redhat.com/rhel-8.3.xml
+@@ -0,0 +1,134 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++ <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>
++ <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>
++ <volume-id>RHEL-8-3-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
++ </iso>
++ <kernel>isolinux/vmlinuz</kernel>
++ <initrd>isolinux/initrd.img</initrd>
++ </media>
++
++ <media arch="ppc64le">
++ <iso>
++ <system-id>PPC</system-id>
++ <volume-id>RHEL[_-]8[_-]3[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
++ </iso>
++ <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>
++ <version>^8.3(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>aarch64</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="ppc64le">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.3(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>ppc64le</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="s390x">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.3(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>s390x</arch>
++ </treeinfo>
++ </tree>
++
++ <tree arch="x86_64">
++ <treeinfo>
++ <family>Red Hat Enterprise Linux</family>
++ <version>^8.3(.([0-9]|[1-9][0-9]))?$</version>
++ <arch>x86_64</arch>
++ </treeinfo>
++ </tree>
++
++ <resources arch="ppc64le">
++ <minimum>
++ <n-cpus>1</n-cpus>
++ <cpu>1000000000</cpu>
++ <ram>2147483648</ram>
++ <storage>10737418240</storage>
++ </minimum>
++
++ <recommended>
++ <cpu>4000000000</cpu>
++ <ram>2147483648</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </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>
++
++ <maximum>
++ <ram>26388279066624</ram>
++ </maximum>
++
++ <network-install>
++ <ram>3221225472</ram>
++ </network-install>
++ </resources>
++
++ <installer>
++ <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/0002-rhel-Add-8.2-entry.patch b/SOURCES/0002-rhel-Add-8.2-entry.patch
deleted file mode 100644
index 52ebeac..0000000
--- a/SOURCES/0002-rhel-Add-8.2-entry.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From ea3d294c14e8d43fbe24afe5c59d11f52a96e8ec Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 10 Dec 2019 10:13:28 +0100
-Subject: [PATCH] rhel: Add 8.2 entry
-
-Signed-off-by: rpm-build <rpm-build>
----
- os/redhat.com/rhel-8-unknown.xml | 20 ++---
- os/redhat.com/rhel-8.2.xml | 134 +++++++++++++++++++++++++++++++
- 2 files changed, 144 insertions(+), 10 deletions(-)
- create mode 100644 os/redhat.com/rhel-8.2.xml
-
-diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
-index 1480185..82cfb4a 100644
---- a/os/redhat.com/rhel-8-unknown.xml
-+++ b/os/redhat.com/rhel-8-unknown.xml
-@@ -19,13 +19,13 @@
- <family>linux</family>
- <distro>rhel</distro>
- <codename>Ootpa</codename>
-- <upgrades id="http://redhat.com/rhel/8.1"/>
-- <derives-from id="http://redhat.com/rhel/8.1"/>
-+ <upgrades id="http://redhat.com/rhel/8.2"/>
-+ <derives-from id="http://redhat.com/rhel/8.2"/>
-
- <media arch="x86_64">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>.*RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
-+ <volume-id>.*RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
- </iso>
- <kernel>isolinux/vmlinuz</kernel>
- <initrd>isolinux/initrd.img</initrd>
-@@ -34,28 +34,28 @@
- <media arch="aarch64">
- <iso>
- <system-id>LINUX</system-id>
-- <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+ <volume-id>RHEL-8-([3-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[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+ <volume-id>RHEL[_-]8[_-]([3-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-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+ <volume-id>RHEL-8-([3-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>
-- <version>^8.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+ <version>^8.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
- <arch>aarch64</arch>
- </treeinfo>
- </tree>
-@@ -63,7 +63,7 @@
- <tree arch="ppc64le">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+ <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
- <arch>ppc64le</arch>
- </treeinfo>
- </tree>
-@@ -71,7 +71,7 @@
- <tree arch="s390x">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+ <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
- <arch>s390x</arch>
- </treeinfo>
- </tree>
-@@ -79,7 +79,7 @@
- <tree arch="x86_64">
- <treeinfo>
- <family>Red Hat Enterprise Linux</family>
-- <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+ <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
- <arch>x86_64</arch>
- </treeinfo>
- </tree>
-diff --git a/os/redhat.com/rhel-8.2.xml b/os/redhat.com/rhel-8.2.xml
-new file mode 100644
-index 0000000..cfc9599
---- /dev/null
-+++ b/os/redhat.com/rhel-8.2.xml
-@@ -0,0 +1,134 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+ <os id="http://redhat.com/rhel/8.2">
-+ <short-id>rhel8.2</short-id>
-+ <name>Red Hat Enterprise Linux 8.2</name>
-+ <version>8.2</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>
-+ <family>linux</family>
-+ <distro>rhel</distro>
-+ <codename>Ootpa</codename>
-+ <upgrades id="http://redhat.com/rhel/8.1"/>
-+ <derives-from id="http://redhat.com/rhel/8.1"/>
-+
-+ <release-date>2020-04-28</release-date>
-+
-+ <media arch="x86_64">
-+ <iso>
-+ <system-id>LINUX</system-id>
-+ <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
-+ </iso>
-+ <kernel>isolinux/vmlinuz</kernel>
-+ <initrd>isolinux/initrd.img</initrd>
-+ </media>
-+
-+ <media arch="ppc64le">
-+ <iso>
-+ <system-id>PPC</system-id>
-+ <volume-id>RHEL[_-]8[_-]2[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
-+ </iso>
-+ <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-2-(([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-2-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-+ </iso>
-+ </media>
-+
-+ <tree arch="aarch64">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux</family>
-+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
-+ <arch>aarch64</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <tree arch="ppc64le">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux</family>
-+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
-+ <arch>ppc64le</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <tree arch="s390x">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux</family>
-+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
-+ <arch>s390x</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <tree arch="x86_64">
-+ <treeinfo>
-+ <family>Red Hat Enterprise Linux</family>
-+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
-+ <arch>x86_64</arch>
-+ </treeinfo>
-+ </tree>
-+
-+ <resources arch="ppc64le">
-+ <minimum>
-+ <n-cpus>1</n-cpus>
-+ <cpu>1000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+
-+ <recommended>
-+ <cpu>4000000000</cpu>
-+ <ram>2147483648</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </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>
-+
-+ <maximum>
-+ <ram>26388279066624</ram>
-+ </maximum>
-+
-+ <network-install>
-+ <ram>3221225472</ram>
-+ </network-install>
-+ </resources>
-+
-+ <installer>
-+ <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.23.0
-
diff --git a/SOURCES/osinfo-db-20200203.tar.xz.asc b/SOURCES/osinfo-db-20200203.tar.xz.asc
deleted file mode 100644
index fdbe9c9..0000000
--- a/SOURCES/osinfo-db-20200203.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl44Xu0ACgkQ7pJsK9rM
-F3vOBBAAvFyGMt3+Cf8M9GLXVytqBnucbp9T2I8fgD/X7DkrtgVcjhFbFGfgWFHZ
-SUQezbVXV1nfDnm+7MQNy+Z2tta6gmUzfCL5iPZWf6A+Cu8sEGToqC3SWKKjz5y6
-zHsor4F32S4ArD+3BnNSWeR4wY3dkY7WqxBcC700x8SiKq1+F/u8w+lCV9X2FU9a
-WzPnCT5wqGv4LvtpyJ0C6gqqTcxg2itCub7OOK9vmkMipgaM7rjtIoD5nX3vP7OG
-gubXoehe+FPb/ya/pZ3YZ9jYI44BaATfecLlG1L+ig3W6lp8B/MHjWrKiuEQZztX
-maae4EBcd8PsAwwltJRsfOhWdexSeEGZs1VqIQU2YuOnu8s3C4YxNxFhtL1s6pMB
-5pMIfPr835VB4WiZxehG6gezQFN93cH93+ZKyjO7wgV5Kq2YfjjKHqOSetGy57yf
-VHdWZhss9ln3U7vfzYIs4IYkCj9L53kOKi61/rBk/Wxh7A//7gQndiHVwI++mJcg
-d3pxfUXplevP0JMpbPgw83EBf2YycO7xFF7fbAp2LW5nQAFWzGomhC5ZTI41zekM
-palSCT6H0/AoB6/hUwkihfHSw6VhOOBHY/BOc6JQ/y9FkVzpoq7zueEI1t+bd3Y7
-ZUuo3S/GEr/cyLJHmRG9U0LFI5gcqSYCej+vrBnDF7ZWiCmcHQw=
-=3nIy
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20200529.tar.xz.asc b/SOURCES/osinfo-db-20200529.tar.xz.asc
new file mode 100644
index 0000000..1f29394
--- /dev/null
+++ b/SOURCES/osinfo-db-20200529.tar.xz.asc
@@ -0,0 +1,16 @@
+-----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/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index e51d811..03e0c56 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -4,7 +4,7 @@
Summary: osinfo database files
Name: osinfo-db
-Version: 20200203
+Version: 20200529
Release: 1%{?dist}
License: LGPLv2+
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
@@ -12,8 +12,7 @@ Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.
URL: http://libosinfo.org/
### Downstream Patches ###
-Patch0001: 0001-rhel-Add-7.8-entry.patch
-Patch0002: 0002-rhel-Add-8.2-entry.patch
+Patch0001: 0001-rhel-Add-8.3-entry.patch
BuildRequires: intltool
BuildRequires: osinfo-db-tools
@@ -60,6 +59,11 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema
%changelog
+* 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
+- Resolves: rhbz#1707119 - Provide information about UEFI support for guests (osinfo-db)
+
* Mon Feb 03 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200203-1
- Update to v20200203 release
- Resolves: rhbz#1780529 - Update to the latest upstream release