diff --git a/.gitignore b/.gitignore
index 9f97fd8..e7a945c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20200804.tar.xz
+SOURCES/osinfo-db-20200813.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index cd71895..8506a0a 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-17303d28e1aaefc37e71920a69e1872a37319869 SOURCES/osinfo-db-20200804.tar.xz
+be3815c0c09ce4009ee8c927cfffc290311cbea9 SOURCES/osinfo-db-20200813.tar.xz
diff --git a/SOURCES/0001-rhel-Add-8.3-entry.patch b/SOURCES/0001-rhel-Add-8.3-entry.patch
deleted file mode 100644
index 2e7c867..0000000
--- a/SOURCES/0001-rhel-Add-8.3-entry.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-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: Fabiano Fidêncio <fidencio@redhat.com>
----
- 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 b7f0ba2..dc9941d 100644
---- a/os/redhat.com/rhel-8-unknown.xml
-+++ b/os/redhat.com/rhel-8-unknown.xml
-@@ -28,12 +28,12 @@
- <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>
-@@ -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>
- <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>
- <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>
- <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>
- <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..b0ed3fe
---- /dev/null
-+++ b/os/redhat.com/rhel-8.3.xml
-@@ -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="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"/>
-+ <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>
-+ <maximum>
-+ <n-cpus>768</n-cpus>
-+ <ram>35184372088832</ram>
-+ </maximum>
-+ </resources>
-+ <resources arch="x86_64">
-+ <minimum>
-+ <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"/>
-+ </installer>
-+ </os>
-+</libosinfo>
---
-2.26.2
-
diff --git a/SOURCES/osinfo-db-20200804.tar.xz.asc b/SOURCES/osinfo-db-20200804.tar.xz.asc
deleted file mode 100644
index f919fe0..0000000
--- a/SOURCES/osinfo-db-20200804.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------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/SOURCES/osinfo-db-20200813.tar.xz.asc b/SOURCES/osinfo-db-20200813.tar.xz.asc
new file mode 100644
index 0000000..d61bb97
--- /dev/null
+++ b/SOURCES/osinfo-db-20200813.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl81HC8ACgkQ7pJsK9rM
+F3sWbA/+I/97erNbPNyn1cSvykx9yWrntgB0/tGBoNjAOVTroxIER4phe5g8zbwv
+KkIl/ez9nhJ55LfG9q84WnNJNRJdPOPTjauwzOGk/WNFu6Xry5WZ/Kt7JVf0UAu4
+FIx2LpGCgB5IExsgVtQJuzgVO78UDvyW9jvCP/IqIiXbg30CbktTXCD2LR0wLf6v
+0APvZWGFu1WjkFYuo9n3FL2WKMH/Bq2Y7fZwj7fXZWx2wDrjCcUvzusTxlk9yGvR
+HeVuSdc/REUyWvMZGE43Z0TTXkOkIlFq/YSb7YZhohBX6XZQy0OhWsuaiLxdo9Wl
+Pb+oudvmrkpQ50iJR4Ni7ttKOOF9mypH29iLC+tLpkw9uSppifJoxVOUFQ/q0Pyl
+0iuaT0PFrMo2bLXFKPdLMtQJ6yxaHNFp0Vn27l2R3pdzeWW8+0Y2Xu7fdpP1/2ej
+4ZgGg6JgUDPfsXEcsclr5WTtDxPTx6G4qmVnBd4KIO8InGuWebJZJB3qFlf3rg0M
+uN9M1w+0fFRP81S9XNm8JkBaoXXICL+U0ZZodXjgSAAn2DAmCt5K4VQdBePX3uim
+b1Fcw3SjtgX4TMLc6FfGIuY/Rw4ofdkBfGoDnAZ9szpOuGMFHKGvFYg5WqV1Z8L6
+RMsiqjVT3MP9dal8+zQ5o+S38LqC97Ximw84k3lyDT31AQL5sWg=
+=kyQ4
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 3735338..fb7fd3b 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -4,16 +4,13 @@
Summary: osinfo database files
Name: osinfo-db
-Version: 20200804
-Release: 2%{?dist}
+Version: 20200813
+Release: 1%{?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
URL: http://libosinfo.org/
-### Downstream Patches ###
-Patch0001: 0001-rhel-Add-8.3-entry.patch
-
BuildRequires: intltool
BuildRequires: osinfo-db-tools
BuildArch: noarch
@@ -26,9 +23,6 @@ provisioning of new virtual machines
%prep
%setup
-for p in %patches ; do
- %__patch -p1 -i $p
-done
# Remove spurious leftovers from when applying the patches
find ../%{name}-%{version}/ -name "*.orig" -exec rm -f {} \;
@@ -59,6 +53,11 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema
%changelog
+* Thu Aug 13 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200813-1
+- Update to v20200813 release
+- Related: rhbz#1837756 - osinfo-db is out of date
+- Resolves: rhbz#1868030 - 'osinfo-query os' is missing latest version of Ubuntu and Oracle Linux
+
* 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