diff --git a/.gitignore b/.gitignore
index e046da9..bbd6f17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20250124.tar.xz
+SOURCES/osinfo-db-20250606.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 6fd3b86..5ec9f5e 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-3792b7d997bd37be1c15c9484378006d40c91506 SOURCES/osinfo-db-20250124.tar.xz
+309efca5f61721aaa83e76ad667892c2b2e5d57a SOURCES/osinfo-db-20250606.tar.xz
diff --git a/SOURCES/0001-add-rhel-9.6-rhel-9.7-prerelease.patch b/SOURCES/0001-add-rhel-9.6-rhel-9.7-prerelease.patch
deleted file mode 100644
index cfd520a..0000000
--- a/SOURCES/0001-add-rhel-9.6-rhel-9.7-prerelease.patch
+++ /dev/null
@@ -1,481 +0,0 @@
-From 335f2b596707070100db911606070b5b96b00554 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 10 Jun 2025 15:31:21 +0200
-Subject: [PATCH 1/3] add: rhel 9.6, rhel 9.7 (prerelease)
-
-Update rhel-9-unknown to match 9.8 and later.
-
-f566665d rhel: Add RHEL 9.7 (prerelease)
-27b4355f Add rhel 9.6 release date
-5a0c2bab rhel: Add RHEL 9.6 (prerelease)
-
-Resolves: RHEL-87787
-Signed-off-by: rpm-build <rpm-build>
----
- os/redhat.com/rhel-9-unknown.xml |  28 ++---
- os/redhat.com/rhel-9.6.xml       | 170 +++++++++++++++++++++++++++++++
- os/redhat.com/rhel-9.7.xml       | 170 +++++++++++++++++++++++++++++++
- 3 files changed, 354 insertions(+), 14 deletions(-)
- create mode 100644 os/redhat.com/rhel-9.6.xml
- create mode 100644 os/redhat.com/rhel-9.7.xml
-
-diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml
-index f4ce9b7..20a0953 100644
---- a/os/redhat.com/rhel-9-unknown.xml
-+++ b/os/redhat.com/rhel-9-unknown.xml
-@@ -5,12 +5,12 @@
-   <os id="http://redhat.com/rhel/9-unknown">
-     <short-id>rhel9-unknown</short-id>
-     <name>Red Hat Enterprise Linux 9 Unknown</name>
--    <name xml:lang="zh_Hans">Red Hat Enterprise Linux 9 Unknown</name>
-+    <name xml:lang="zh-Hans">Red Hat Enterprise Linux 9 Unknown</name>
-     <name xml:lang="ka">Red Hat Enterprise Linux 9 Unknown</name>
-     <name xml:lang="ko">Red Hat &#xAE30;&#xC5C5;&#xC6A9; &#xB9AC;&#xB205;&#xC2A4; 9 (&#xC54C; &#xC218; &#xC5C6;&#xC74C;)</name>
-     <name xml:lang="uk">Red Hat Enterprise Linux 9 &#x43D;&#x435;&#x432;&#x456;&#x434;&#x43E;&#x43C;&#x430;</name>
-     <name xml:lang="tr">Red Hat Enterprise Linux 9 Bilinmeyen</name>
--    <name xml:lang="pt_BR">Red Hat Enterprise Linux 9 desconhecido</name>
-+    <name xml:lang="pt-BR">Red Hat Enterprise Linux 9 desconhecido</name>
-     <name xml:lang="pl">Red Hat Enterprise Linux 9 (nieznany)</name>
-     <name xml:lang="it">Red Hat Enterprise Linux 9 (sconosciuto)</name>
-     <name xml:lang="id">Red Hat Enterprise Linux 9 Tak Diketahui</name>
-@@ -18,13 +18,13 @@
-     <name xml:lang="de">Red Hat Enterprise Linux 9 Unknown</name>
-     <version>9-unknown</version>
-     <vendor>Red Hat, Inc</vendor>
--    <vendor xml:lang="zh_Hans">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="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>
-@@ -36,59 +36,59 @@
-     <family>linux</family>
-     <distro>rhel</distro>
-     <codename>Plow</codename>
--    <upgrades id="http://redhat.com/rhel/9.4"/>
--    <derives-from id="http://redhat.com/rhel/9.4"/>
-+    <upgrades id="http://redhat.com/rhel/9.7"/>
-+    <derives-from id="http://redhat.com/rhel/9.7"/>
-     <media arch="x86_64">
-       <iso>
--        <volume-id>.*RHEL-9-([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
-+        <volume-id>.*RHEL-9-([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>
-     </media>
-     <media arch="aarch64">
-       <iso>
--        <volume-id>RHEL-9-([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+        <volume-id>RHEL-9-([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>
-     </media>
-     <media arch="ppc64le">
-       <iso>
--        <volume-id>RHEL[_-]9[_-]([6-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+        <volume-id>RHEL[_-]9[_-]([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>
-     </media>
-     <media arch="s390x">
-       <iso>
--        <volume-id>RHEL-9-([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+        <volume-id>RHEL-9-([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>^9.([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+        <version>^9.([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>^9.([6-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.([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>^9.([6-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.([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>^9.([6-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^9.([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-9.6.xml b/os/redhat.com/rhel-9.6.xml
-new file mode 100644
-index 0000000..bf12c20
---- /dev/null
-+++ b/os/redhat.com/rhel-9.6.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.6">
-+    <short-id>rhel9.6</short-id>
-+    <name>Red Hat Enterprise Linux 9.6</name>
-+    <version>9.6</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.5"/>
-+    <derives-from id="http://redhat.com/rhel/9.5"/>
-+    <release-date>2025-05-16</release-date>
-+    <!-- RHEL 9.6 entries have to cope both with 9.6 and 9.6.x regexes for
-+         medias' volume-id and trees' version -->
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>RHEL-9-6-(([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[_-]6[_-](([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-6-(([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-6-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.6(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.6(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.6(.([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.6(.([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>
-diff --git a/os/redhat.com/rhel-9.7.xml b/os/redhat.com/rhel-9.7.xml
-new file mode 100644
-index 0000000..8f25a83
---- /dev/null
-+++ b/os/redhat.com/rhel-9.7.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.7">
-+    <short-id>rhel9.7</short-id>
-+    <name>Red Hat Enterprise Linux 9.7</name>
-+    <version>9.7</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.6"/>
-+    <derives-from id="http://redhat.com/rhel/9.6"/>
-+    <release-status>prerelease</release-status>
-+    <!-- RHEL 9.7 entries have to cope both with 9.7 and 9.7.x regexes for
-+         medias' volume-id and trees' version -->
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>RHEL-9-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>
-+        <volume-id>RHEL[_-]9[_-]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>
-+        <volume-id>RHEL-9-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>
-+        <volume-id>RHEL-9-7-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.7(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.7(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^9.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>^9.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.49.0
-
diff --git a/SOURCES/0002-add-rhel-10.0-rhel-10.1-prerelease.patch b/SOURCES/0002-add-rhel-10.0-rhel-10.1-prerelease.patch
deleted file mode 100644
index 0bf8d3d..0000000
--- a/SOURCES/0002-add-rhel-10.0-rhel-10.1-prerelease.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-From 8d6dcd880899cc7bcb74197918fea8dbda88d7bd Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 10 Jun 2025 15:33:02 +0200
-Subject: [PATCH 2/3] add: rhel 10.0, rhel 10.1 (prerelease)
-
-Update rhel-10-unknown to match 10.2 and later.
-
-62f8adce rhel: Add RHEL 10.1 (prerelease)
-2a374acd rhel10: set release date, add test data
-
-Related: RHEL-87787
-Signed-off-by: rpm-build <rpm-build>
----
- os/redhat.com/rhel-10-unknown.xml |  28 ++---
- os/redhat.com/rhel-10.0.xml       |  10 +-
- os/redhat.com/rhel-10.1.xml       | 168 ++++++++++++++++++++++++++++++
- 3 files changed, 187 insertions(+), 19 deletions(-)
- create mode 100644 os/redhat.com/rhel-10.1.xml
-
-diff --git a/os/redhat.com/rhel-10-unknown.xml b/os/redhat.com/rhel-10-unknown.xml
-index ee3519e..d464e8e 100644
---- a/os/redhat.com/rhel-10-unknown.xml
-+++ b/os/redhat.com/rhel-10-unknown.xml
-@@ -15,13 +15,13 @@
-     <name xml:lang="fr">Red Hat Enterprise Linux 10 inconnu</name>
-     <version>10-unknown</version>
-     <vendor>Red Hat, Inc</vendor>
--    <vendor xml:lang="zh_Hans">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="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>
-@@ -33,59 +33,59 @@
-     <family>linux</family>
-     <distro>rhel</distro>
-     <codename>Coughlan</codename>
--    <upgrades id="http://redhat.com/rhel/10.0"/>
--    <derives-from id="http://redhat.com/rhel/10.0"/>
-+    <upgrades id="http://redhat.com/rhel/10.1"/>
-+    <derives-from id="http://redhat.com/rhel/10.1"/>
-     <media arch="x86_64">
-       <iso>
--        <volume-id>RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
-+        <volume-id>RHEL-10-([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>
-+      <kernel>images/pxeboot/vmlinuz</kernel>
-+      <initrd>images/pxeboot/initrd.img</initrd>
-     </media>
-     <media arch="aarch64">
-       <iso>
--        <volume-id>RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
-+        <volume-id>RHEL-10-([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[_-]10[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
-+        <volume-id>RHEL[_-]10[_-]([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-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+        <volume-id>RHEL-10-([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>^10.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
-+        <version>^10.([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>^10.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^10.([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>^10.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^10.([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>^10.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
-+        <version>^10.([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-10.0.xml b/os/redhat.com/rhel-10.0.xml
-index 9f11c48..cdc2b57 100644
---- a/os/redhat.com/rhel-10.0.xml
-+++ b/os/redhat.com/rhel-10.0.xml
-@@ -15,13 +15,13 @@
-     <name xml:lang="fr">Red Hat Enterprise Linux 10.0</name>
-     <version>10.0</version>
-     <vendor>Red Hat, Inc</vendor>
--    <vendor xml:lang="zh_Hans">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="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>
-@@ -35,13 +35,13 @@
-     <codename>Coughlan</codename>
-     <upgrades id="http://redhat.com/rhel/9.5"/>
-     <derives-from id="http://redhat.com/rhel/9.5"/>
--    <release-status>prerelease</release-status>
-+    <release-date>2025-05-20</release-date>
-     <media arch="x86_64">
-       <iso>
-         <volume-id>RHEL-10-0(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
-       </iso>
--      <kernel>isolinux/vmlinuz</kernel>
--      <initrd>isolinux/initrd.img</initrd>
-+      <kernel>images/pxeboot/vmlinuz</kernel>
-+      <initrd>images/pxeboot/initrd.img</initrd>
-     </media>
-     <media arch="aarch64">
-       <iso>
-diff --git a/os/redhat.com/rhel-10.1.xml b/os/redhat.com/rhel-10.1.xml
-new file mode 100644
-index 0000000..16aa649
---- /dev/null
-+++ b/os/redhat.com/rhel-10.1.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.1">
-+    <short-id>rhel10.1</short-id>
-+    <name>Red Hat Enterprise Linux 10.1</name>
-+    <version>10.1</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.0"/>
-+    <derives-from id="http://redhat.com/rhel/10.0"/>
-+    <release-status>prerelease</release-status>
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>RHEL-10-1(-[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-1(-[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[_-]1([_-]([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-1(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
-+      </iso>
-+    </media>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^10.1(-[0-9]|[1-9][0-9])?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^10.1(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^10.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>^10.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.49.0
-
diff --git a/SOURCES/0003-add-Windows-Server-2025.patch b/SOURCES/0003-add-Windows-Server-2025.patch
deleted file mode 100644
index 2d64e4b..0000000
--- a/SOURCES/0003-add-Windows-Server-2025.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 4cbcfd01671d9c815338efd22525d6d9ec8f386f Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 10 Jun 2025 15:37:53 +0200
-Subject: [PATCH 3/3] add: Windows Server 2025
-
-074e10f2 wink25: add Windows Server 2025
-
-Resolves: RHEL-82513
-Signed-off-by: rpm-build <rpm-build>
----
- os/microsoft.com/win-2k25.xml | 55 +++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
- create mode 100644 os/microsoft.com/win-2k25.xml
-
-diff --git a/os/microsoft.com/win-2k25.xml b/os/microsoft.com/win-2k25.xml
-new file mode 100644
-index 0000000..0fd9526
---- /dev/null
-+++ b/os/microsoft.com/win-2k25.xml
-@@ -0,0 +1,55 @@
-+<?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://microsoft.com/win/2k25">
-+    <short-id>win2k25</short-id>
-+    <name>Microsoft Windows Server 2025</name>
-+    <version>10.0</version>
-+    <vendor>Microsoft Corporation</vendor>
-+    <vendor xml:lang="zh-Hans">Microsoft Corporation</vendor>
-+    <vendor xml:lang="ka">Microsoft Corporation</vendor>
-+    <vendor xml:lang="ko">Microsoft Corporation</vendor>
-+    <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
-+    <vendor xml:lang="tr">Microsoft Corporation</vendor>
-+    <vendor xml:lang="pt-BR">Microsoft Corporation</vendor>
-+    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-+    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-+    <vendor xml:lang="it">Microsoft Corporation</vendor>
-+    <vendor xml:lang="id">Microsoft Corporation</vendor>
-+    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-+    <vendor xml:lang="es">Microsoft Corporation</vendor>
-+    <vendor xml:lang="de">Microsoft Corporation</vendor>
-+    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-+    <family>winnt</family>
-+    <distro>win</distro>
-+    <derives-from id="http://microsoft.com/win/2k22"/>
-+    <upgrades id="http://microsoft.com/win/2k22"/>
-+    <release-date>2024-11-01</release-date>
-+    <eol-date>2034-10-10</eol-date>
-+    <media arch="x86_64">
-+      <iso>
-+        <volume-id>^(SSS_X64CHK|SSS_X64FREE?|SSS_X64FREV)_</volume-id>
-+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[A-Z0-9]*_([A-Z]*)</l10n-language>
-+      </iso>
-+    </media>
-+    <resources arch="x86_64">
-+      <minimum>
-+        <cpu>1400000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>536870912</ram>
-+        <storage>34359738368</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>2000000000</cpu>
-+        <ram>4294967296</ram>
-+        <storage>42949672960</storage>
-+      </recommended>
-+      <maximum>
-+        <!-- 256 TB -->
-+        <ram>281474976710656</ram>
-+      </maximum>
-+    </resources>
-+  </os>
-+</libosinfo>
--- 
-2.49.0
-
diff --git a/SOURCES/osinfo-db-20250124.tar.xz.asc b/SOURCES/osinfo-db-20250124.tar.xz.asc
deleted file mode 100644
index d6cb3b0..0000000
--- a/SOURCES/osinfo-db-20250124.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmeTat8ACgkQl9kSPeN6
-SE94zg/+Jslb+0CDVhWzlBTF8/QmM5lnopI1L76THCdrKuJ3wntEZEL+DvfIExKv
-d16JEyfZXbBqx8uY+WSXdDbyUnveSBPVzysPMQ5ZJYj4bVFsT0ET+Ce2Rdp/lmLy
-dek2O97qmok6DhDb6ctO97uUnO73/onR4sIbZ0F3Mvn4HJkR7s5nTO3BehrJPJV0
-+vWo82MWyV39+SzLtbh0aYIDnohK6JLnjdEwambSHDrH+shyFjOBsHYQZUBWBi7c
-7s0OlQAJJ+NSP75nxaHOQb8rn3nCAW9EHXT0d0OlTCy0tdtm7Bjh/JPe2cCgY19h
-icP/2uHLFhE/5+g9pHyeX0xe/PE4flz6cXY8vvjwOaxZv1W5mQ+wg42xqOHm2LZQ
-uf1WuzS/BiTsfWTYd2oVnL3JtrIAExpTzfAuFFkLkVnpFZZ19My9UUM5WuBgdDTh
-mwycMciYDh+MScJQ7tHv8t5hj7c6sCuMHS25C1vK8Fs9vfjWMvOA4kGsV/oMFwJk
-2ZNx5UMHGvnECCI8TGtXM4neRJhbmGHaW0y67RpPaZ1FiH65iQM2JAzxoPI1cMcz
-DXbE60DXAqA7AGeg7Bepmpx9jjr/+BC+mEPclLIbawZOCAldOM9Yr0UXKFL+wHWM
-D4d/kA5qscXdjPuZyKpZwtP0Pkkxnefi66eW6UZ1vSwj1er7J70=
-=WSIF
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20250606.tar.xz.asc b/SOURCES/osinfo-db-20250606.tar.xz.asc
new file mode 100644
index 0000000..9c2703e
--- /dev/null
+++ b/SOURCES/osinfo-db-20250606.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmhCx6kACgkQl9kSPeN6
+SE9A/g//TB0f/KGBgzgyNEDLdI7sUMjB9soaYHtYqgQh3F11eH68B50x24V1SFMF
+g98osPGitiUOtFaQdl1kQMGc46HQcoWFctoVX66jPgcp+5WdnrWNitDB4OMrzX5Q
+L0wgJ5zvyp9C9yjsQuFD0eh6iCXGW/WkhaktnUFC08UamEh502+Sj59V5qNDV2DJ
+JppYE7cQIOZe2TmTZCCV9r4rWwS1Qqt7Yd9mC9fbh4V3qL1In59Zw+vswVX8ORqe
+KXyCqOlQ5DdiIig4pciqW7NLkdVhOXfYXaRrMqjF2v2CBO4XSHvxcDsjq1YHo8GA
+2T73mKiLcK8u6TwMlMpLErzzMLpOpxEhI8/3YfRAkBMywCVzOTIOghz8j8TzCd5R
+0U+vsfaKY1e298sIEHpvzfcNcIj+8i+5lUUJpKG3LGMMxIByN4ZofVyFgwVDtLR7
+lJ1FJ4E0IZRy3s4acblTmi0g1RMZ2is8vM8Q5q9luqJmKsbMrjU+qRGnM5jtZvqF
+E//9Z0kpTohb1J8bl/6KiN+BUYy2xKdSGQ5s1q1bGe1cEaLS+mEWsaw/N75EdZZA
++Y5WyDr0Xsmqqpb4dKiAXUU06xrc1sMFbrfIZlOZOKnLyygDimj5FXB3uZgT4+7a
+lI33i2yYycTWX8hilHRuJ/KFOoZGzHkp+9glHUmbe6I6DNNRSHE=
+=JNKe
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 9e4ea0f..ce3df39 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -1,8 +1,5 @@
 # -*- rpm-spec -*-
 
-%define PatchedSource ../%{name}-%{version}-patched.tar.xz
-%define ExtractedSource %{name}-%{version}
-
 %define with_mingw 0
 %if 0%{?fedora}
     %define with_mingw 0%{!?_without_mingw:1}
@@ -10,17 +7,13 @@
 
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20250124
-Release: 2%{?dist}
+Version: 20250606
+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-add-rhel-9.6-rhel-9.7-prerelease.patch
-Patch0002: 0002-add-rhel-10.0-rhel-10.1-prerelease.patch
-Patch0003: 0003-add-Windows-Server-2025.patch
 BuildRequires: intltool
-BuildRequires: git-core
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
 Requires: hwdata
@@ -30,23 +23,16 @@ The osinfo database provides information about operating systems and
 hypervisor platforms to facilitate the automated configuration and
 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 {} +
 %endif
 
 %if %{with_mingw}
-osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{PatchedSource}
-osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSource}
+osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{SOURCE0}
+osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
 %endif
 
 %files
@@ -61,11 +47,9 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSo
 %{_datadir}/osinfo/schema
 
 %changelog
-* Tue Jun 10 2025 Victor Toso <victortoso@redhat.com> - 20250124-2
-- Fix missing rhel 9.6 and related
-  Resolves: RHEL-87787
-- Fix missing windows server 2025
-  Resolves: RHEL-82513
+* Fri Jun 06 2025 Victor Toso <victortoso@redhat.com> - 20250606-1
+- Update to new release (v20250606)
+  Resolves: rhbz#RHEL-95251
 
 * Mon Jan 27 2025 Victor Toso <victortoso@redhat.com> - 20250124-1
 - Update to new release (v20250124)