From e99345cdb9466166ee3f2b411ebd101bd598e043 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Fri, 14 Aug 2026 11:34:35 +0200
Subject: [PATCH] osinfo-db-20260812-1.el10

- Rebased to osinfo-db-20260812 (RHEL-238411)
- The rebase also fixes the following bugs:
    RHEL-215502

Resolves: RHEL-215502, RHEL-238411
---
 0001-rhel-Add-RHEL-9.8-prerelease.patch  | 268 -----------------------
 0002-rhel-Add-RHEL-10.2-prerelease.patch | 268 -----------------------
 changelog                                |  76 -------
 gating.yaml                              |   6 -
 osinfo-db.spec                           | 166 ++++++++++++--
 sources                                  |   3 +-
 6 files changed, 148 insertions(+), 639 deletions(-)
 delete mode 100644 0001-rhel-Add-RHEL-9.8-prerelease.patch
 delete mode 100644 0002-rhel-Add-RHEL-10.2-prerelease.patch
 delete mode 100644 changelog
 delete mode 100644 gating.yaml

diff --git a/0001-rhel-Add-RHEL-9.8-prerelease.patch b/0001-rhel-Add-RHEL-9.8-prerelease.patch
deleted file mode 100644
index e4fef7c..0000000
--- a/0001-rhel-Add-RHEL-9.8-prerelease.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From e19c266fbc9c1a1cbcb6747988f38f46b0f55511 Mon Sep 17 00:00:00 2001
-Message-ID: <e19c266fbc9c1a1cbcb6747988f38f46b0f55511.1773051672.git.phrdina@redhat.com>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 9 Mar 2026 11:19:28 +0100
-Subject: [PATCH 1/2] rhel: Add RHEL 9.8 (prerelease)
-
-From: Pavel Hrdina <phrdina@redhat.com>
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
----
- os/redhat.com/rhel-9-unknown.xml |  20 ++--
- os/redhat.com/rhel-9.8.xml       | 170 +++++++++++++++++++++++++++++++
- 2 files changed, 180 insertions(+), 10 deletions(-)
- create mode 100644 os/redhat.com/rhel-9.8.xml
-
-diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml
-index 20a0953..aefc1a0 100644
---- a/os/redhat.com/rhel-9-unknown.xml
-+++ b/os/redhat.com/rhel-9-unknown.xml
-@@ -36,59 +36,59 @@
-     <family>linux</family>
-     <distro>rhel</distro>
-     <codename>Plow</codename>
--    <upgrades id="http://redhat.com/rhel/9.7"/>
--    <derives-from id="http://redhat.com/rhel/9.7"/>
-+    <upgrades id="http://redhat.com/rhel/9.8"/>
-+    <derives-from id="http://redhat.com/rhel/9.8"/>
-     <media arch="x86_64">
-       <iso>
--        <volume-id>.*RHEL-9-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
-+        <volume-id>.*RHEL-9-(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-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+        <volume-id>RHEL-9-(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[_-]([8-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+        <volume-id>RHEL[_-]9[_-](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-([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+        <volume-id>RHEL-9-(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.([8-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+        <version>^9.(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.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.(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.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.(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.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.(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.8.xml b/os/redhat.com/rhel-9.8.xml
-new file mode 100644
-index 0000000..52a2340
---- /dev/null
-+++ b/os/redhat.com/rhel-9.8.xml
-@@ -0,0 +1,170 @@
-+<?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.8">
-+    <short-id>rhel9.8</short-id>
-+    <name>Red Hat Enterprise Linux 9.8</name>
-+    <version>9.8</version>
-+    <vendor>Red Hat, Inc</vendor>
-+    <vendor xml:lang="zh-Hans">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.7"/>
-+    <derives-from id="http://redhat.com/rhel/9.7"/>
-+    <release-status>prerelease</release-status>
-+    <!-- RHEL 9.8 entries have to cope both with 9.8 and 9.8.x regexes for
-+         medias' volume-id and trees' version -->
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>RHEL-9-8-(([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[_-]8[_-](([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-8-(([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-8-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.8(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.8(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.8(.([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.8(.([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.53.0
-
diff --git a/0002-rhel-Add-RHEL-10.2-prerelease.patch b/0002-rhel-Add-RHEL-10.2-prerelease.patch
deleted file mode 100644
index 3803452..0000000
--- a/0002-rhel-Add-RHEL-10.2-prerelease.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 576b66c5367694202ba927e1d18bc1b704a817ce Mon Sep 17 00:00:00 2001
-Message-ID: <576b66c5367694202ba927e1d18bc1b704a817ce.1773051672.git.phrdina@redhat.com>
-In-Reply-To: <e19c266fbc9c1a1cbcb6747988f38f46b0f55511.1773051672.git.phrdina@redhat.com>
-References: <e19c266fbc9c1a1cbcb6747988f38f46b0f55511.1773051672.git.phrdina@redhat.com>
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 9 Mar 2026 11:20:12 +0100
-Subject: [PATCH 2/2] rhel: Add RHEL 10.2 (prerelease)
-
-From: Pavel Hrdina <phrdina@redhat.com>
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
----
- os/redhat.com/rhel-10-unknown.xml |  20 ++--
- os/redhat.com/rhel-10.2.xml       | 168 ++++++++++++++++++++++++++++++
- 2 files changed, 178 insertions(+), 10 deletions(-)
- create mode 100644 os/redhat.com/rhel-10.2.xml
-
-diff --git a/os/redhat.com/rhel-10-unknown.xml b/os/redhat.com/rhel-10-unknown.xml
-index d464e8e..67e5021 100644
---- a/os/redhat.com/rhel-10-unknown.xml
-+++ b/os/redhat.com/rhel-10-unknown.xml
-@@ -33,59 +33,59 @@
-     <family>linux</family>
-     <distro>rhel</distro>
-     <codename>Coughlan</codename>
--    <upgrades id="http://redhat.com/rhel/10.1"/>
--    <derives-from id="http://redhat.com/rhel/10.1"/>
-+    <upgrades id="http://redhat.com/rhel/10.2"/>
-+    <derives-from id="http://redhat.com/rhel/10.2"/>
-     <media arch="x86_64">
-       <iso>
--        <volume-id>RHEL-10-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
-+        <volume-id>RHEL-10-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
-       </iso>
-       <kernel>images/pxeboot/vmlinuz</kernel>
-       <initrd>images/pxeboot/initrd.img</initrd>
-     </media>
-     <media arch="aarch64">
-       <iso>
--        <volume-id>RHEL-10-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+        <volume-id>RHEL-10-([3-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[_-]10[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+        <volume-id>RHEL[_-]10[_-]([3-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-10-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+        <volume-id>RHEL-10-([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>^10.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+        <version>^10.([3-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>^10.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^10.([3-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>^10.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^10.([3-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>^10.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^10.([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-10.2.xml b/os/redhat.com/rhel-10.2.xml
-new file mode 100644
-index 0000000..80d4cf8
---- /dev/null
-+++ b/os/redhat.com/rhel-10.2.xml
-@@ -0,0 +1,168 @@
-+<?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/10.2">
-+    <short-id>rhel10.2</short-id>
-+    <name>Red Hat Enterprise Linux 10.2</name>
-+    <version>10.2</version>
-+    <vendor>Red Hat, Inc</vendor>
-+    <vendor xml:lang="zh-Hans">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>Coughlan</codename>
-+    <upgrades id="http://redhat.com/rhel/10.1"/>
-+    <derives-from id="http://redhat.com/rhel/10.1"/>
-+    <release-status>prerelease</release-status>
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>RHEL-10-2(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
-+      </iso>
-+      <kernel>images/pxeboot/vmlinuz</kernel>
-+      <initrd>images/pxeboot/initrd.img</initrd>
-+    </media>
-+    <media arch="aarch64">
-+      <iso>
-+        <volume-id>RHEL-10-2(-[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[_-]10[_-]2([_-]([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-10-2(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^10.2(-[0-9]|[1-9][0-9])?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^10.2(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^10.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>^10.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>
-+      <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.53.0
-
diff --git a/changelog b/changelog
deleted file mode 100644
index 8891c60..0000000
--- a/changelog
+++ /dev/null
@@ -1,76 +0,0 @@
-* Wed Mar 08 2023 Victor Toso <victortoso@redhat.com> - 20230308-1
-- Update to new release (v20230308)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20221130-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Nov 30 2022 Victor Toso <victortoso@redhat.com> - 20221130-1
-- Update to new release (v20221130)
-
-* Tue Oct 18 2022 Victor Toso <victortoso@redhat.com> - 20221018-1
-- Update to new release (v20221018)
-
-* Tue Aug 30 2022 Victor Toso <victortoso@redhat.com> - 20220830-1
-- Update to new release (v20220830)
-
-* Fri Aug 26 2022 Victor Toso <victortoso@redhat.com> - 20220727-3
-- Switch images/pxeboot in Fedora
-  https://bugzilla.redhat.com/show_bug.cgi?id=2103835
-
-* Tue Aug 23 2022 Daniel P. Berrangé <berrange@redhat.com> - 20220727-2
-- Pull in mingw sub-packages
-
-* Wed Jul 27 2022 Victor Toso <victortoso@redhat.com> - 20220727-1
-- Update to new release (v20220727)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20220516-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 16 2022 Victor Toso <victortoso@redhat.com> - 20220516-1
-- Update to new release (v20220516)
-
-* Mon Feb 14 2022 Victor Toso <victortoso@redhat.com> - 20220214-1
-- Update to new release (v20220214)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211216-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Dec 16 2021 Victor Toso <victortoso@redhat.com> - 20211216-1
-- Update to new release (v20211216)
-
-* Wed Oct 13 2021 Victor Toso <victortoso@redhat.com> - 20211013-1
-- Update to new release (v20211013)
-
-* Fri Sep 03 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210903-1
-- Update to new release (v20210903)
-
-* Mon Aug 09 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210809-1
-- Update to new release (v20210806)
-
-* Fri Aug 06 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210806-1
-- Update to new release (v20210806)
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210621-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jun 21 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210621-1
-- Update to new release (v20210621)
-
-* Mon May 31 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210531-1
-- Update to new release (v20210531)
-
-* Mon Apr 26 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210426-1
-- Update to new release (v20210426)
-
-* Fri Mar 12 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210312-1
-- Update to new release (v20210312)
-
-* Mon Feb 15 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210215-1
-- Don't distribute upstream virtio-win drivers on RHEL
-- Update to new release (v20210215)
-
-* Tue Feb 02 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210202-1
-- Update to new release (v20210202)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201218-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index d353613..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 6679d21..c7a3dc5 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -1,6 +1,6 @@
 # -*- rpm-spec -*-
 
-%global PatchedSource %{_builddir}/%{name}-%{version}-patched.tar.xz
+%global source_date_epoch $(date --utc --date %{version} +%s)
 
 %define with_mingw 0
 %if 0%{?fedora}
@@ -9,21 +9,20 @@
 
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20250606
-Release: %autorelease
+Version: 20260812
+Release: 1%{?dist}%{?extra_release}
 License: GPL-2.0-or-later
-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/
-BuildRequires: intltool
-BuildRequires: osinfo-db-tools
+Source: https://gitlab.com/libosinfo/osinfo-db/-/releases/v%{version}/downloads/%{name}-dist-%{version}.tar.xz
+URL: https://libosinfo.org/
 BuildRequires: git
+BuildRequires: gettext
+BuildRequires: osinfo-db-tools
+BuildRequires: make
+BuildRequires: python3-pytest
+BuildRequires: python3-lxml
 BuildArch: noarch
 Requires: hwdata
 
-Patch0001: 0001-rhel-Add-RHEL-9.8-prerelease.patch
-Patch0002: 0002-rhel-Add-RHEL-10.2-prerelease.patch
-
 %if %{with_mingw}
 BuildRequires: mingw32-filesystem >= 95
 BuildRequires: mingw64-filesystem >= 95
@@ -52,28 +51,32 @@ operating systems for use with virtualization provisioning tools
 %endif
 
 %prep
-%autosetup -S git_am
+%autosetup -S git_am -N
 
 %build
-rm -rf .git
-tar -cJf %{PatchedSource} .
+export SOURCE_DATE_EPOCH=%{source_date_epoch}
+%make_build
 
 %install
-osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
+export SOURCE_DATE_EPOCH=%{source_date_epoch}
+%make_install OSINFO_DB_TARGET="--dir %{_datadir}/osinfo"
 %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
 
 %if %{with_mingw}
-osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{PatchedSource}
-osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSource}
+%make_install OSINFO_DB_TARGET="--dir %{mingw32_datadir}/osinfo"
+%make_install OSINFO_DB_TARGET="--dir %{mingw64_datadir}/osinfo"
 %endif
 
+%check
+make check
+
 %files
 %dir %{_datadir}/osinfo/
+%doc %{_datadir}/osinfo/LICENSE
 %{_datadir}/osinfo/VERSION
-%{_datadir}/osinfo/LICENSE
 %{_datadir}/osinfo/datamap
 %{_datadir}/osinfo/device
 %{_datadir}/osinfo/os
@@ -106,4 +109,129 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSo
 %endif
 
 %changelog
-%autochangelog
+* Fri Aug 14 2026 Pavel Hrdina <phrdina@redhat.com> - 20260812-1
+- Rebased to osinfo-db-20260812 (RHEL-238411)
+- The rebase also fixes the following bugs:
+    RHEL-215502
+
+* Mon Mar 09 2026 Pavel Hrdina <phrdina@redhat.com> - 20250606-2
+- Add rhel-10.2 and rhel-9.8 prerelease
+
+* Fri Jun 06 2025 Victor Toso <victortoso@redhat.com> - 20250606-1
+- Update to v20250606
+
+* Mon Jan 27 2025 Victor Toso <victortoso@redhat.com> - 20250124-1
+- Update to v20250124
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 20240701-4
+- Bump release for October 2024 mass rebuild:
+
+* Mon Oct 14 2024 Victor Toso <victortoso@redhat.com> - 20240701-3
+- Add rhel 10.0 and rhel-10-unknown
+
+* Mon Aug 05 2024 Tomas Pelka <tpelka@redhat.com> - 20240701-2
+- Add gating.yaml via API
+
+* Fri Aug 02 2024 Victor Toso <victortoso@redhat.com> - 20240701-1
+- Update to v20240701
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 20231215-4
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20231215-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20231215-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 15 2023 Victor Toso <victortoso@redhat.com> - 20231215-1
+- Update to v20231215
+
+* Fri Oct 27 2023 Victor Toso <victortoso@redhat.com> - 20231027-1
+- Update to release v20231027
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20230719-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jul 19 2023 Victor Toso <victortoso@redhat.com> - 20230719-1
+- Update to v20230719
+
+* Thu May 18 2023 Victor Toso <victortoso@redhat.com> - 20230518-1
+- Update to release v20230518
+
+* Wed Mar 08 2023 Victor Toso <victortoso@redhat.com> - 20230308-1
+- Update to new release (v20230308)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20221130-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 30 2022 Victor Toso <victortoso@redhat.com> - 20221130-1
+- Update to new release (v20221130)
+
+* Tue Oct 18 2022 Victor Toso <victortoso@redhat.com> - 20221018-1
+- Update to new release (v20221018)
+
+* Tue Aug 30 2022 Victor Toso <victortoso@redhat.com> - 20220830-1
+- Update to new release (v20220830)
+
+* Fri Aug 26 2022 Victor Toso <victortoso@redhat.com> - 20220727-3
+- Switch images/pxeboot in Fedora
+  https://bugzilla.redhat.com/show_bug.cgi?id=2103835
+
+* Tue Aug 23 2022 Daniel P. Berrangé <berrange@redhat.com> - 20220727-2
+- Pull in mingw sub-packages
+
+* Wed Jul 27 2022 Victor Toso <victortoso@redhat.com> - 20220727-1
+- Update to new release (v20220727)
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20220516-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 16 2022 Victor Toso <victortoso@redhat.com> - 20220516-1
+- Update to new release (v20220516)
+
+* Mon Feb 14 2022 Victor Toso <victortoso@redhat.com> - 20220214-1
+- Update to new release (v20220214)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20211216-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 16 2021 Victor Toso <victortoso@redhat.com> - 20211216-1
+- Update to new release (v20211216)
+
+* Wed Oct 13 2021 Victor Toso <victortoso@redhat.com> - 20211013-1
+- Update to new release (v20211013)
+
+* Fri Sep 03 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210903-1
+- Update to new release (v20210903)
+
+* Mon Aug 09 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210809-1
+- Update to new release (v20210806)
+
+* Fri Aug 06 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210806-1
+- Update to new release (v20210806)
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210621-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210621-1
+- Update to new release (v20210621)
+
+* Mon May 31 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210531-1
+- Update to new release (v20210531)
+
+* Mon Apr 26 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210426-1
+- Update to new release (v20210426)
+
+* Fri Mar 12 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210312-1
+- Update to new release (v20210312)
+
+* Mon Feb 15 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210215-1
+- Don't distribute upstream virtio-win drivers on RHEL
+- Update to new release (v20210215)
+
+* Tue Feb 02 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210202-1
+- Update to new release (v20210202)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20201218-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 734f627..0e421d0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (osinfo-db-20250606.tar.xz) = 5ca94d83a30ac05aae47155a483718b1e6061d0935407fa394efb3f5a2e51c9956a63b6a1ad37d557192468843593219faaf3e8ca0748a9c695cd74f933c5f78
-SHA512 (osinfo-db-20250606.tar.xz.asc) = 99a622a0f9d1282ecbeb47637f4ab07aa4922c2d6070577e07e5c7cbf13082c1b1482cd3f52320b0d7f5d4214f98422cdb0f004243cc73dde23611ae78f73425
+SHA512 (osinfo-db-dist-20260812.tar.xz) = afb4a4de15a386c502445d42435b8d024aa118fee03c4895fed7a2b72fb7184b9b385b2a3d5a2c6cf6afea2c716d2283c004b27cfb9d98947fca18df7b4761e8