diff --git a/.gitignore b/.gitignore
index 171935d..ce73136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20200529.tar.xz
+SOURCES/osinfo-db-20210215.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 9449b4e..5725ba9 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-f35431aa1f569927c689d3d827cdd385062d3246 SOURCES/osinfo-db-20200529.tar.xz
+eb65b68e69b1955167d30ff6c9a213affde78418 SOURCES/osinfo-db-20210215.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 1d4a66e..0000000
--- a/SOURCES/0001-rhel-Add-8.3-entry.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-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/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-20210215.tar.xz.asc b/SOURCES/osinfo-db-20210215.tar.xz.asc
new file mode 100644
index 0000000..8cd645d
--- /dev/null
+++ b/SOURCES/osinfo-db-20210215.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAmAqUSwACgkQ7pJsK9rM
+F3v2DBAAxIotcbyCjulyMUnCFnqwH8M6ogKA44OygwndimIRDfvZBcscRNR4DuMJ
+kf6x0L6uWwGfOtORaYtZ40wtrPWp/UoYdM134SlyETa70lp4f2mO1CBWVO4j4i7d
+Iw7p2ZqYWF4l8n7LiLzVUWyBVTi4e5NyJT6Y4UTmDjB/0luW6M9w3SKEmHIeTKDn
+CqW9kXoOOTX9fxybsxnRZzxMZaPR4NIybUB8I+XAzDLjPfsGXuQzlUKtjstPqF9O
+2HSNB17RNLubO9UOa7oEq5NWsLJ/q/oHTaWgGfvqCQJQjK3UtmP+Zz5DZYqSFi/1
+X+xr8j1Pe+QNTYMmUFyCXIcXGAMffLbAB4YGxDOum4Yy355paa+rM4RgQSo6ZgAv
+ESCo4opAGamh5bzruNLzDX9fKSLezo/NQ3r2voJkld4xKx1CC+mws/cZWuFewSrz
+vy2KVv20R2J2eUUMvgNCAOun8GFwwd3a/Pem6KnXfjn3CsJIH4xnq11KI13RKBz/
+96grCUwmw9Tq2CQRsu7DEVuG+RsoOXIOiY1Y9Ktj1M7tDkSfvIRqhV7CIQmVh68L
+8grURI97zOXMinlAUt9+gB3cwia1HseqtFqNkk6hLs53y1mo7Huothzt6S67ZnZI
+w8dpmDFuOWm6H1PBojvvs5tVJvyc0dGOASsMWZHZQK8oyvEMzaI=
+=AFN6
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 03e0c56..d26dd88 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -1,19 +1,13 @@
# -*- rpm-spec -*-
-%define PatchedSource ../%{name}-%{version}-patched.tar.xz
-
Summary: osinfo database files
Name: osinfo-db
-Version: 20200529
+Version: 20210215
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
@@ -24,28 +18,12 @@ The osinfo database provides information about operating systems and
hypervisor platforms to facilitate the automated configuration and
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 {} \;
-
-# Remove the upstream virtio-win / spice-guest-tools drivers
-find ../%{name}-%{version}/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
-
-# For us to be able to apply patches on top of a rebase, we:
-# 1. unpack the sources
-# 2. patch the sources
-# 3. pack the sources in a tarball
-# 4. feed the patched tarball to osinfo-db-import
-%build
-tar -cvJf %{PatchedSource} ../%{name}-%{version}/
-
%install
-osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
+osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+%if 0%{?rhel}
+# Remove the upstream virtio-win / spice-guest-tools drivers
+find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
+%endif
%files
%dir %{_datadir}/osinfo/
@@ -59,6 +37,25 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%{_datadir}/osinfo/schema
%changelog
+* Mon Feb 15 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210215-1
+- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
+
+* Thu Feb 04 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 20201218-3
+- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
+
+* 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
+
+* 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