From ecc68e881e8468514eadbeb47173a08931267e52 Mon Sep 17 00:00:00 2001
From: Victor Toso <victortoso@redhat.com>
Date: Tue, 23 May 2023 12:09:42 +0200
Subject: [PATCH] Update to new release (v20230518)

Resolves: rhbz#2184782
Resolves: rhbz#2184613
Signed-off-by: Victor Toso <victortoso@redhat.com>
---
 .gitignore                              |   2 +
 0001-rhel-Add-RHEL-8.7-prerelease.patch | 272 ------------------------
 0002-rhel-Add-RHEL-9.1-prerelease.patch | 267 -----------------------
 osinfo-db.spec                          |  20 +-
 sources                                 |   3 +-
 5 files changed, 12 insertions(+), 552 deletions(-)
 delete mode 100644 0001-rhel-Add-RHEL-8.7-prerelease.patch
 delete mode 100644 0002-rhel-Add-RHEL-9.1-prerelease.patch

diff --git a/.gitignore b/.gitignore
index 4558af5..4334d2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 SOURCES/osinfo-db-20220727.tar.xz
 /osinfo-db-20220727.tar.xz
+/osinfo-db-20230518.tar.xz
+/osinfo-db-20230518.tar.xz.asc
diff --git a/0001-rhel-Add-RHEL-8.7-prerelease.patch b/0001-rhel-Add-RHEL-8.7-prerelease.patch
deleted file mode 100644
index d136647..0000000
--- a/0001-rhel-Add-RHEL-8.7-prerelease.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From 5ce5373899c529027aad4d93c54dc127a7d8fcc6 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Tue, 2 Aug 2022 15:26:05 +0200
-Subject: [PATCH 1/2] rhel: Add RHEL 8.7 (prerelease)
-Content-type: text/plain
-
-Release is planned for November.
-Signed-off-by: Victor Toso <victortoso@redhat.com>
----
- os/redhat.com/rhel-8-unknown.xml |  20 ++--
- os/redhat.com/rhel-8.7.xml       | 171 +++++++++++++++++++++++++++++++
- 2 files changed, 181 insertions(+), 10 deletions(-)
- create mode 100644 os/redhat.com/rhel-8.7.xml
-
-diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
-index 15ea794..75b8742 100644
---- a/os/redhat.com/rhel-8-unknown.xml
-+++ b/os/redhat.com/rhel-8-unknown.xml
-@@ -33,12 +33,12 @@
-     <family>linux</family>
-     <distro>rhel</distro>
-     <codename>Ootpa</codename>
--    <upgrades id="http://redhat.com/rhel/8.6"/>
--    <derives-from id="http://redhat.com/rhel/8.6"/>
-+    <upgrades id="http://redhat.com/rhel/8.7"/>
-+    <derives-from id="http://redhat.com/rhel/8.7"/>
-     <media arch="x86_64">
-       <iso>
-         <system-id>LINUX</system-id>
--        <volume-id>.*RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
-+        <volume-id>.*RHEL-8-([8-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>
-@@ -46,7 +46,7 @@
-     <media arch="aarch64">
-       <iso>
-         <system-id>LINUX</system-id>
--        <volume-id>RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+        <volume-id>RHEL-8-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-       </iso>
-       <kernel>images/pxeboot/vmlinuz</kernel>
-       <initrd>images/pxeboot/initrd.img</initrd>
-@@ -54,7 +54,7 @@
-     <media arch="ppc64le">
-       <iso>
-         <system-id>PPC</system-id>
--        <volume-id>RHEL[_-]8[_-]([7-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+        <volume-id>RHEL[_-]8[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-       </iso>
-       <kernel>ppc/ppc64/vmlinuz</kernel>
-       <initrd>ppc/ppc64/initrd.img</initrd>
-@@ -62,34 +62,34 @@
-     <media arch="s390x">
-       <iso>
-         <system-id>LINUX</system-id>
--        <volume-id>RHEL-8-([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+        <volume-id>RHEL-8-([8-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.([7-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+        <version>^8.([8-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.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^8.([8-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.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^8.([8-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.([7-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^8.([8-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.7.xml b/os/redhat.com/rhel-8.7.xml
-new file mode 100644
-index 0000000..b69f8cd
---- /dev/null
-+++ b/os/redhat.com/rhel-8.7.xml
-@@ -0,0 +1,171 @@
-+<?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.7">
-+    <short-id>rhel8.7</short-id>
-+    <name>Red Hat Enterprise Linux 8.7</name>
-+    <version>8.7</version>
-+    <vendor>Red Hat, Inc</vendor>
-+    <vendor xml:lang="ka">Red Hat, Inc</vendor>
-+    <vendor xml:lang="ko">Red Hat, Inc</vendor>
-+    <vendor xml:lang="fi">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.6"/>
-+    <derives-from id="http://redhat.com/rhel/8.6"/>
-+    <release-status>prerelease</release-status>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>RHEL-8-7-(([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[_-]7[_-](([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-7-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
-+      </iso>
-+      <kernel>images/pxeboot/vmlinuz</kernel>
-+      <initrd>images/pxeboot/initrd.img</initrd>
-+    </media>
-+    <media arch="s390x">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>RHEL-8-7-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.7(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.7(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.7(.([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.7(.([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.37.1
-
diff --git a/0002-rhel-Add-RHEL-9.1-prerelease.patch b/0002-rhel-Add-RHEL-9.1-prerelease.patch
deleted file mode 100644
index 385b077..0000000
--- a/0002-rhel-Add-RHEL-9.1-prerelease.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-From d2257154ae08fe8ffb44a50350bc940cb01538a1 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Tue, 2 Aug 2022 15:27:53 +0200
-Subject: [PATCH 2/2] rhel: Add RHEL 9.1 (prerelease)
-Content-type: text/plain
-
-Release is planned for November.
-
-Signed-off-by: Victor Toso <victortoso@redhat.com>
----
- os/redhat.com/rhel-9-unknown.xml |  20 ++--
- os/redhat.com/rhel-9.1.xml       | 169 +++++++++++++++++++++++++++++++
- 2 files changed, 179 insertions(+), 10 deletions(-)
- create mode 100644 os/redhat.com/rhel-9.1.xml
-
-diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml
-index 7940a23..4caff12 100644
---- a/os/redhat.com/rhel-9-unknown.xml
-+++ b/os/redhat.com/rhel-9-unknown.xml
-@@ -32,59 +32,59 @@
-     <family>linux</family>
-     <distro>rhel</distro>
-     <codename>Plow</codename>
--    <upgrades id="http://redhat.com/rhel/9.0"/>
--    <derives-from id="http://redhat.com/rhel/9.0"/>
-+    <upgrades id="http://redhat.com/rhel/9.1"/>
-+    <derives-from id="http://redhat.com/rhel/9.1"/>
-     <media arch="x86_64">
-       <iso>
--        <volume-id>.*RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
-+        <volume-id>.*RHEL-9-([2-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>
-     </media>
-     <media arch="aarch64">
-       <iso>
--        <volume-id>RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+        <volume-id>RHEL-9-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-       </iso>
-       <kernel>images/pxeboot/vmlinuz</kernel>
-       <initrd>images/pxeboot/initrd.img</initrd>
-     </media>
-     <media arch="ppc64le">
-       <iso>
--        <volume-id>RHEL[_-]9[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+        <volume-id>RHEL[_-]9[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-       </iso>
-       <kernel>ppc/ppc64/vmlinuz</kernel>
-       <initrd>ppc/ppc64/initrd.img</initrd>
-     </media>
-     <media arch="s390x">
-       <iso>
--        <volume-id>RHEL-9-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+        <volume-id>RHEL-9-([2-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>^9.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+        <version>^9.([2-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>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.([2-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>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.([2-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>^9.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.([2-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-9.1.xml b/os/redhat.com/rhel-9.1.xml
-new file mode 100644
-index 0000000..78ce34a
---- /dev/null
-+++ b/os/redhat.com/rhel-9.1.xml
-@@ -0,0 +1,169 @@
-+<?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/9.1">
-+    <short-id>rhel9.1</short-id>
-+    <name>Red Hat Enterprise Linux 9.1</name>
-+    <version>9.1</version>
-+    <vendor>Red Hat, Inc</vendor>
-+    <vendor xml:lang="ka">Red Hat, Inc</vendor>
-+    <vendor xml:lang="ko">Red Hat, Inc</vendor>
-+    <vendor xml:lang="fi">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>Plow</codename>
-+    <upgrades id="http://redhat.com/rhel/9.0"/>
-+    <derives-from id="http://redhat.com/rhel/9.0"/>
-+    <release-status>prerelease</release-status>
-+    <!-- RHEL 9.1 entries have to cope both with 9.1 and 9.1.x regexes for
-+         medias' volume-id and trees' version -->
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>RHEL-9-1-(([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>
-+        <volume-id>RHEL[_-]9[_-]1[_-](([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>
-+        <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
-+      </iso>
-+      <kernel>images/pxeboot/vmlinuz</kernel>
-+      <initrd>images/pxeboot/initrd.img</initrd>
-+    </media>
-+    <media arch="s390x">
-+      <iso>
-+        <volume-id>RHEL-9-1-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.1(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>s390x</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="x86_64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.1(.([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.37.1
-
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 05c1fc8..a11a611 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -1,18 +1,13 @@
 # -*- rpm-spec -*-
 
-%define PatchedSource ../%{name}-%{version}-patched.tar.xz
-%define ExtractedSource %{name}-%{version}
-
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20220727
-Release: 2%{?dist}
+Version: 20230518
+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/
-Patch0001: 0001-rhel-Add-RHEL-8.7-prerelease.patch
-Patch0002: 0002-rhel-Add-RHEL-9.1-prerelease.patch
 BuildRequires: intltool
 BuildRequires: git-core
 BuildRequires: osinfo-db-tools
@@ -27,12 +22,8 @@ provisioning of new virtual machines
 %prep
 %autosetup -S git_am
 
-%build
-rm -rf ../%{ExtractedSource}/.git
-tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
-
 %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 {} +
@@ -50,6 +41,11 @@ find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -
 %{_datadir}/osinfo/schema
 
 %changelog
+* Tue May 23 2023 Victor Toso <victortoso@redhat.com> - 20230518-1
+- Update to new release (v20230518)
+  Resolves: rhbz#2184782
+  Resolves: rhbz#2184613
+
 * Tue Aug 02 2022 Victor Toso <victortoso@redhat.com> - 20220727-2
 - Add prereleases: rhel-8.7 and rhel-9.1
   Resolves: rhbz#2103908
diff --git a/sources b/sources
index 06a41a5..a97ae9f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (osinfo-db-20220727.tar.xz) = 1b0bbf64e6808e06bd3d40ef4da932a7f96957a79fc4a1d8d11074da25acd81b016aaf5816dcf39c6f28cf0a17734aab8238d25d2628ee05e80a37a09ad363f3
+SHA512 (osinfo-db-20230518.tar.xz) = 16a275c8df9df8256b117896b749b060f7b63aa59e468d968fafdb68ee8654c73cd659c6b8bf36e91a0d5892d6d83a29d98b9fc77dd1286f8f25ffca289bba4e
+SHA512 (osinfo-db-20230518.tar.xz.asc) = 5441abc9c2d2ccb2c4fd629092cefea620830e7f86c92e5dad7b4b3b4dc8fe03d94ff57c90a0b7c2d462d0884cefb8e578ecce570682cd2763724fe3b67b7e14