From 43df0665e1f73d6125fd33537b45e0e77e74f19deadc0b0433e338d91241f918 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Mon, 22 Aug 2022 11:16:53 +0000
Subject: [PATCH] Accepting request 992115 from home:dirkmueller:Factory

- update to 20220727
- drop: add-opensuse-leap-15.4-support.patch
  add-sle15sp4-support.patch
  add-slem5.1-support.patch
  add-slem5.2-support.patch
  opensuse-autoyast-desktop.patch: all upstream

OBS-URL: https://build.opensuse.org/request/show/992115
OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=125
---
 add-opensuse-leap-15.4-support.patch | 249 ---------------------------
 add-sle15sp4-support.patch           | 106 ------------
 add-slem5.1-support.patch            | 165 ------------------
 add-slem5.2-support.patch            |  78 ---------
 add-win-2k19-media-info.patch        |   8 +-
 fix-tumbleweed-order.patch           |  12 +-
 opensuse-autoyast-desktop.patch      |  24 ---
 osinfo-db-20220516.tar.xz            |   3 -
 osinfo-db-20220727.tar.xz            |   3 +
 osinfo-db.changes                    |  10 ++
 osinfo-db.spec                       |  28 +--
 11 files changed, 29 insertions(+), 657 deletions(-)
 delete mode 100644 add-opensuse-leap-15.4-support.patch
 delete mode 100644 add-sle15sp4-support.patch
 delete mode 100644 add-slem5.1-support.patch
 delete mode 100644 add-slem5.2-support.patch
 delete mode 100644 opensuse-autoyast-desktop.patch
 delete mode 100644 osinfo-db-20220516.tar.xz
 create mode 100644 osinfo-db-20220727.tar.xz

diff --git a/add-opensuse-leap-15.4-support.patch b/add-opensuse-leap-15.4-support.patch
deleted file mode 100644
index a20eb9b..0000000
--- a/add-opensuse-leap-15.4-support.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- /dev/null	2021-07-26 03:43:20.464161362 -0600
-+++ osinfo-db-20210621/os/opensuse.org/opensuse-15.4.xml	2021-07-26 04:03:28.136190139 -0600
-@@ -0,0 +1,246 @@
-+<?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://opensuse.org/opensuse/15.4">
-+    <short-id>opensuse15.4</short-id>
-+    <name>openSUSE Leap 15.4</name>
-+    <name xml:lang="ko">&#xC624;&#xD508;&#xC218;&#xC138; &#xB9BD; 15.4</name>
-+    <name xml:lang="uk">openSUSE Leap 15.4</name>
-+    <name xml:lang="tr">openSUSE Leap 15.4</name>
-+    <name xml:lang="pt_BR">openSUSE Leap 15.4</name>
-+    <name xml:lang="pl">openSUSE Leap 15.4</name>
-+    <name xml:lang="it">openSUSE Leap 15.4</name>
-+    <name xml:lang="id">openSUSE Leap 15.4</name>
-+    <version>15.4</version>
-+    <vendor>openSUSE</vendor>
-+    <vendor xml:lang="ko">&#xC624;&#xD508;&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">openSUSE</vendor>
-+    <vendor xml:lang="tr">openSUSE</vendor>
-+    <vendor xml:lang="pt_BR">openSUSE</vendor>
-+    <vendor xml:lang="pl">openSUSE</vendor>
-+    <vendor xml:lang="ja">openSUSE</vendor>
-+    <vendor xml:lang="it">openSUSE</vendor>
-+    <vendor xml:lang="id">openSUSE</vendor>
-+    <vendor xml:lang="fr">openSUSE</vendor>
-+    <vendor xml:lang="es">openSUSE</vendor>
-+    <vendor xml:lang="de">openSUSE</vendor>
-+    <vendor xml:lang="ca">openSUSE</vendor>
-+    <family>linux</family>
-+    <distro>opensuse</distro>
-+    <upgrades id="http://opensuse.org/opensuse/15.2"/>
-+    <derives-from id="http://opensuse.org/opensuse/15.2"/>
-+    <release-date>2022-06-02</release-date>
-+    <variant id="netinst">
-+      <name>openSUSE Leap 15.4</name>
-+      <name xml:lang="ko">&#xC624;&#xD508;&#xC218;&#xC138; &#xB9BD; 15.4</name>
-+      <name xml:lang="uk">openSUSE Leap 15.4</name>
-+      <name xml:lang="tr">openSUSE Leap 15.4</name>
-+      <name xml:lang="pt_BR">openSUSE Leap 15.4</name>
-+      <name xml:lang="pl">openSUSE Leap 15.4</name>
-+      <name xml:lang="it">openSUSE Leap 15.4</name>
-+      <name xml:lang="id">openSUSE Leap 15.4</name>
-+    </variant>
-+    <!-- DVD -->
-+    <media arch="x86_64">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-x86_64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-DVD-x86_64*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <!-- Network -->
-+    <media arch="x86_64">
-+      <variant id="netinst"/>
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-NET-x86_64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-NET-x86_64*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <!-- DVD -->
-+    <media arch="aarch64">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-aarch64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-DVD-aarch64*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/aarch64/loader/linux</kernel>
-+      <initrd>boot/aarch64/loader/initrd</initrd>
-+    </media>
-+    <!-- Network -->
-+    <media arch="aarch64">
-+      <variant id="netinst"/>
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-NET-aarch64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-NET-aarch64*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/aarch64/loader/linux</kernel>
-+      <initrd>boot/aarch64/loader/initrd</initrd>
-+    </media>
-+    <!-- DVD -->
-+    <media arch="ppc64le">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-ppc64le.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-DVD-ppc64le*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/ppc64le/loader/linux</kernel>
-+      <initrd>boot/ppc64le/loader/initrd</initrd>
-+    </media>
-+    <!-- Network -->
-+    <media arch="ppc64le">
-+      <variant id="netinst"/>
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-NET-ppc64le.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-NET-ppc64le*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/ppc64le/loader/linux</kernel>
-+      <initrd>boot/ppc64le/loader/initrd</initrd>
-+    </media>
-+    <!-- DVD -->
-+    <media arch="s390x">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-DVD-s390x.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-DVD-s390x*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/s390x/loader/linux</kernel>
-+      <initrd>boot/s390x/loader/initrd</initrd>
-+    </media>
-+    <!-- Network -->
-+    <media arch="s390x">
-+      <variant id="netinst"/>
-+      <url>https://download.opensuse.org/distribution/leap/15.4/iso/openSUSE-Leap-15.4-NET-s390x.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.4-NET-s390x*</volume-id>
-+        <system-id>LINUX</system-id>
-+        <publisher-id>SUSE LINUX GmbH</publisher-id>
-+      </iso>
-+      <kernel>boot/s390x/loader/linux</kernel>
-+      <initrd>boot/s390x/loader/initrd</initrd>
-+    </media>
-+    <!-- Live GNOME -->
-+    <media arch="x86_64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/live/openSUSE-Leap-15.4-GNOME-Live-x86_64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.4_GNOME_Live</volume-id>
-+        <publisher-id>SUSE LINUX GMBH</publisher-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <!-- Live GNOME -->
-+    <media arch="aarch64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/live/openSUSE-Leap-15.4-GNOME-Live-aarch64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.4_GNOME_Live</volume-id>
-+        <publisher-id>SUSE LINUX GMBH</publisher-id>
-+      </iso>
-+      <kernel>boot/aarch64/loader/linux</kernel>
-+      <initrd>boot/aarch64/loader/initrd</initrd>
-+    </media>
-+    <!-- Live KDE -->
-+    <media arch="x86_64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/live/openSUSE-Leap-15.4-KDE-Live-x86_64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.4_KDE_Live</volume-id>
-+        <publisher-id>SUSE LINUX GMBH</publisher-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <!-- Live KDE -->
-+    <media arch="aarch64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/live/openSUSE-Leap-15.4-KDE-Live-aarch64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.4_KDE_Live</volume-id>
-+        <publisher-id>SUSE LINUX GMBH</publisher-id>
-+      </iso>
-+      <kernel>boot/aarch64/loader/linux</kernel>
-+      <initrd>boot/aarch64/loader/initrd</initrd>
-+    </media>
-+    <!-- Live Rescue CD -->
-+    <media arch="x86_64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/live/openSUSE-Leap-15.4-Rescue-CD-x86_64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.4_Rescue_CD</volume-id>
-+        <publisher-id>SUSE LINUX GMBH</publisher-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <!-- Live Rescue CD -->
-+    <media arch="aarch64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.4/live/openSUSE-Leap-15.4-Rescue-CD-aarch64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.4_Rescue_CD</volume-id>
-+        <publisher-id>SUSE LINUX GMBH</publisher-id>
-+      </iso>
-+      <kernel>boot/aarch64/loader/linux</kernel>
-+      <initrd>boot/aarch64/loader/initrd</initrd>
-+    </media>
-+    <tree arch="x86_64">
-+      <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.4/repo/oss/</url>
-+      <treeinfo>
-+        <family>openSUSE Leap</family>
-+        <version>15.4</version>
-+        <arch>x86_64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="aarch64">
-+      <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.4/repo/oss/</url>
-+      <treeinfo>
-+        <family>openSUSE Leap</family>
-+        <version>15.4</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.4/repo/oss/</url>
-+      <treeinfo>
-+        <family>openSUSE Leap</family>
-+        <version>15.4</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.4/repo/oss/</url>
-+      <treeinfo>
-+        <family>openSUSE Leap</family>
-+        <version>15.4</version>
-+        <arch>s390x</arch>
-+      </treeinfo>
-+    </tree>
-+    <installer>
-+      <script id="http://opensuse.org/opensuse/autoyast/jeos"/>
-+      <script id="http://opensuse.org/opensuse/autoyast/desktop"/>
-+    </installer>
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>1600000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>1073741824</ram>
-+        <storage>3221225472</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>2400000000</cpu>
-+        <ram>2147483648</ram>
-+        <storage>17179869184</storage>
-+      </recommended>
-+    </resources>
-+  </os>
-+</libosinfo>
diff --git a/add-sle15sp4-support.patch b/add-sle15sp4-support.patch
deleted file mode 100644
index 53c081f..0000000
--- a/add-sle15sp4-support.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- /dev/null	2021-07-26 03:43:20.464161362 -0600
-+++ osinfo-db-20210621/os/suse.com/sle-15.4.xml	2021-07-26 03:59:53.432185023 -0600
-@@ -0,0 +1,103 @@
-+<?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://suse.com/sle/15.4">
-+    <short-id>sle15sp4</short-id>
-+    <name>SUSE Linux Enterprise 15 SP4</name>
-+    <name xml:lang="ko">&#xC218;&#xC138; &#xB9AC;&#xB205;&#xC2A4; &#xAE30;&#xC5C5;&#xC6A9; 15 SP4</name>
-+    <name xml:lang="uk">SUSE Linux Enterprise 15 SP4</name>
-+    <name xml:lang="tr">SUSE Linux Enterprise 15 SP4</name>
-+    <name xml:lang="pl">SUSE Linux Enterprise 15 SP4</name>
-+    <name xml:lang="it">SUSE Linux Enterprise 15 SP4</name>
-+    <version>15.4</version>
-+    <vendor>SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <family>linux</family>
-+    <distro>sle</distro>
-+    <upgrades id="http://suse.com/sle/15.3"/>
-+    <derives-from id="http://suse.com/sle/15.3"/>
-+    <release-date>2022-06-02</release-date>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SLE-15-SP4.*-x86_64.*</volume-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <media arch="aarch64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SLE-15-SP4.*-aarch64.*</volume-id>
-+      </iso>
-+      <kernel>boot/aarch64/linux</kernel>
-+      <initrd>boot/aarch64/initrd</initrd>
-+    </media>
-+    <media arch="ppc64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SLE-15-SP4.*-ppc64le.*</volume-id>
-+      </iso>
-+      <kernel>boot/ppc64le/linux</kernel>
-+      <initrd>boot/ppc64le/initrd</initrd>
-+    </media>
-+    <media arch="s390x">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SLE-15-SP4.*-s390x.*</volume-id>
-+      </iso>
-+      <kernel>boot/s390x/linux</kernel>
-+      <initrd>boot/s390x/initrd</initrd>
-+    </media>
-+    <tree arch="x86_64">
-+      <treeinfo>
-+        <family>SUSE Linux Enterprise Server</family>
-+        <version>15.4</version>
-+        <arch>x86_64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>SUSE Linux Enterprise Server</family>
-+        <version>15.4</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>SUSE Linux Enterprise Server</family>
-+        <version>15.4</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>SUSE Linux Enterprise Server</family>
-+        <version>15.4</version>
-+        <arch>s390x</arch>
-+      </treeinfo>
-+    </tree>
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>500000000</cpu>
-+        <ram>536870912</ram>
-+        <storage>1074151424</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>2400000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>17179869184</storage>
-+      </recommended>
-+    </resources>
-+  </os>
-+</libosinfo>
diff --git a/add-slem5.1-support.patch b/add-slem5.1-support.patch
deleted file mode 100644
index fc55117..0000000
--- a/add-slem5.1-support.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- /dev/null	2021-07-26 03:43:20.464161362 -0600
-+++ osinfo-db-20210621/os/suse.com/slem-5.1.xml	2021-07-26 04:08:52.692197873 -0600
-@@ -0,0 +1,162 @@
-+<?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://suse.com/slem/5.1">
-+    <short-id>slem5.1</short-id>
-+    <name>SUSE Linux Enterprise Micro 5.1</name>
-+    <name xml:lang="ko">&#xC218;&#xC138; &#xB9AC;&#xB205;&#xC2A4; &#xAE30;&#xC5C5;&#xC6A9; Micro 5.1</name>
-+    <name xml:lang="uk">SUSE Linux Enterprise Micro 5.1</name>
-+    <name xml:lang="tr">SUSE Linux Enterprise Micro 5.1</name>
-+    <name xml:lang="pl">SUSE Linux Enterprise Micro 5.1</name>
-+    <name xml:lang="it">SUSE Linux Enterprise Micro 5.1</name>
-+    <version>5.1</version>
-+    <vendor>SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <family>linux</family>
-+    <distro>slem</distro>
-+    <derives-from id="http://suse.com/sle/15.3"/>
-+    <release-date>2021-12-31</release-date>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.1-DVD-x86_6489.4</volume-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <media arch="aarch64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.1-DVD-aarch64.4</volume-id>
-+      </iso>
-+      <kernel>boot/aarch64/linux</kernel>
-+      <initrd>boot/aarch64/initrd</initrd>
-+    </media>
-+    <media arch="ppc64le">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.1-DVD-ppc64le.4</volume-id>
-+      </iso>
-+      <kernel>boot/ppc64le/linux</kernel>
-+      <initrd>boot/ppc64le/initrd</initrd>
-+    </media>
-+    <media arch="s390x">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.1-DVD-s390x.4</volume-id>
-+      </iso>
-+      <kernel>boot/s390x/linux</kernel>
-+      <initrd>boot/s390x/initrd</initrd>
-+    </media>
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>500000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>12884901888</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>2400000000</cpu>
-+        <ram>4294967296</ram>
-+        <storage>64424509440</storage>
-+      </recommended>
-+    </resources>
-+  </os>
-+</libosinfo>
diff --git a/add-slem5.2-support.patch b/add-slem5.2-support.patch
deleted file mode 100644
index 4a2220e..0000000
--- a/add-slem5.2-support.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- /dev/null
-+++ b/os/suse.com/slem-5.2.xml
-@@ -0,0 +1,75 @@
-+<?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://suse.com/slem/5.2">
-+    <short-id>slem5.2</short-id>
-+    <name>SUSE Linux Enterprise Micro 5.2</name>
-+    <name xml:lang="ko">&#xC218;&#xC138; &#xB9AC;&#xB205;&#xC2A4; &#xAE30;&#xC5C5;&#xC6A9; Micro 5.2</name>
-+    <name xml:lang="uk">SUSE Linux Enterprise Micro 5.2</name>
-+    <name xml:lang="tr">SUSE Linux Enterprise Micro 5.2</name>
-+    <name xml:lang="pl">SUSE Linux Enterprise Micro 5.2</name>
-+    <name xml:lang="it">SUSE Linux Enterprise Micro 5.2</name>
-+    <version>5.2</version>
-+    <vendor>SUSE</vendor>
-+    <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <vendor xml:lang="tr">SUSE</vendor>
-+    <vendor xml:lang="pt_BR">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <family>linux</family>
-+    <distro>slem</distro>
-+    <derives-from id="http://suse.com/sle/15.3"/>
-+    <release-date>2022-04-04</release-date>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.2-DVD-x86_649.001</volume-id>
-+      </iso>
-+      <kernel>boot/x86_64/loader/linux</kernel>
-+      <initrd>boot/x86_64/loader/initrd</initrd>
-+    </media>
-+    <media arch="aarch64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.2-DVD-aarch64.001</volume-id>
-+      </iso>
-+      <kernel>boot/aarch64/linux</kernel>
-+      <initrd>boot/aarch64/initrd</initrd>
-+    </media>
-+    <media arch="ppc64le">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.2-DVD-ppc64le.001</volume-id>
-+      </iso>
-+      <kernel>boot/ppc64le/linux</kernel>
-+      <initrd>boot/ppc64le/initrd</initrd>
-+    </media>
-+    <media arch="s390x">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SUSE-MicroOS-5.2-DVD-s390x.001</volume-id>
-+      </iso>
-+      <kernel>boot/s390x/linux</kernel>
-+      <initrd>boot/s390x/initrd</initrd>
-+    </media>
-+    <resources arch="all">
-+      <minimum>
-+        <cpu>500000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>12884901888</storage>
-+      </minimum>
-+      <recommended>
-+        <cpu>2400000000</cpu>
-+        <ram>4294967296</ram>
-+        <storage>64424509440</storage>
-+      </recommended>
-+    </resources>
-+  </os>
-+</libosinfo>
diff --git a/add-win-2k19-media-info.patch b/add-win-2k19-media-info.patch
index ac50106..8dca045 100644
--- a/add-win-2k19-media-info.patch
+++ b/add-win-2k19-media-info.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20210531/os/microsoft.com/win-2k19.xml
+Index: osinfo-db-20220727/os/microsoft.com/win-2k19.xml
 ===================================================================
---- osinfo-db-20210531.orig/os/microsoft.com/win-2k19.xml
-+++ osinfo-db-20210531/os/microsoft.com/win-2k19.xml
-@@ -33,6 +33,22 @@
+--- osinfo-db-20220727.orig/os/microsoft.com/win-2k19.xml
++++ osinfo-db-20220727/os/microsoft.com/win-2k19.xml
+@@ -35,6 +35,22 @@
      <upgrades id="http://microsoft.com/win/2k16"/>
      <release-date>2018-11-13</release-date>
      <eol-date>2029-01-09</eol-date>
diff --git a/fix-tumbleweed-order.patch b/fix-tumbleweed-order.patch
index b257156..9dd7015 100644
--- a/fix-tumbleweed-order.patch
+++ b/fix-tumbleweed-order.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20210531/os/opensuse.org/opensuse-tumbleweed.xml
+Index: osinfo-db-20220727/os/opensuse.org/opensuse-tumbleweed.xml
 ===================================================================
---- osinfo-db-20210531.orig/os/opensuse.org/opensuse-tumbleweed.xml
-+++ osinfo-db-20210531/os/opensuse.org/opensuse-tumbleweed.xml
-@@ -58,16 +58,6 @@
+--- osinfo-db-20220727.orig/os/opensuse.org/opensuse-tumbleweed.xml
++++ osinfo-db-20220727/os/opensuse.org/opensuse-tumbleweed.xml
+@@ -62,16 +62,6 @@
        <name xml:lang="fr">openSUSE Tumbleweed (Kubic)</name>
      </variant>
      <!-- DVD Image -->
@@ -19,7 +19,7 @@ Index: osinfo-db-20210531/os/opensuse.org/opensuse-tumbleweed.xml
      <media arch="x86_64">
        <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-x86_64-Current.iso</url>
        <iso>
-@@ -78,18 +68,17 @@
+@@ -82,18 +72,17 @@
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
      </media>
@@ -41,7 +41,7 @@ Index: osinfo-db-20210531/os/opensuse.org/opensuse-tumbleweed.xml
      <media arch="x86_64">
        <variant id="netinst"/>
        <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso</url>
-@@ -101,6 +90,17 @@
+@@ -105,6 +94,17 @@
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
      </media>
diff --git a/opensuse-autoyast-desktop.patch b/opensuse-autoyast-desktop.patch
deleted file mode 100644
index 5f4175c..0000000
--- a/opensuse-autoyast-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: osinfo-db-20220214/install-script/opensuse.org/opensuse-autoyast-desktop.xml
-===================================================================
---- osinfo-db-20220214.orig/install-script/opensuse.org/opensuse-autoyast-desktop.xml
-+++ osinfo-db-20220214/install-script/opensuse.org/opensuse-autoyast-desktop.xml
-@@ -232,9 +232,16 @@ touch /root/osinfo-install-successful
-               <default_target>graphical</default_target>
-             </services-manager>
-             <software>
--              <products config:type="list">
--                <product>openSUSE</product>
--              </products>
-+              <xsl:if test="contains(os/version, 'tumbleweed')">
-+                <products config:type="list">
-+                  <product>openSUSE</product>
-+                </products>
-+              </xsl:if>
-+              <xsl:if test="(os/version &lt; 15.5) or contains(os/version, 42)">
-+                <products config:type="list">
-+                  <product>Leap</product>
-+                </products>
-+              </xsl:if>
-               <packages config:type="list">
-                 <package>autoyast2-installation</package>
-                 <package>gdm</package>
diff --git a/osinfo-db-20220516.tar.xz b/osinfo-db-20220516.tar.xz
deleted file mode 100644
index de53fd5..0000000
--- a/osinfo-db-20220516.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d60f69d8afc9dcc53d76a2fb68d54c26d1fdc3a822b95c1801de58c3c66cda6d
-size 129272
diff --git a/osinfo-db-20220727.tar.xz b/osinfo-db-20220727.tar.xz
new file mode 100644
index 0000000..0b7b38d
--- /dev/null
+++ b/osinfo-db-20220727.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2291e5234ed899a830c36f2b4056ff5e76235f4ba07b593421f4865290634d5e
+size 133656
diff --git a/osinfo-db.changes b/osinfo-db.changes
index 4481d3c..e013f8a 100644
--- a/osinfo-db.changes
+++ b/osinfo-db.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug  1 22:34:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 20220727
+- drop: add-opensuse-leap-15.4-support.patch
+  add-sle15sp4-support.patch
+  add-slem5.1-support.patch
+  add-slem5.2-support.patch
+  opensuse-autoyast-desktop.patch: all upstream
+ 
 -------------------------------------------------------------------
 Mon May 23 15:40:45 MDT 2022 - carnold@suse.com
 
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 71cf508..c4f066c 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -12,31 +12,25 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           osinfo-db
-Version:        20220516
+Version:        20220727
 Release:        0
 Summary:        Osinfo database files
-License:        LGPL-2.1+ and GPL-2.0+
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later
 Group:          System/Management
-BuildArch:      noarch
-Url:            https://gitlab.com/libosinfo/osinfo-db
+URL:            https://gitlab.com/libosinfo/osinfo-db
 Source:         https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
 Patch21:        add-oes-support.patch
 Patch22:        add-caasp40-support.patch
 Patch23:        add-win-2k19-media-info.patch
 Patch24:        fix-tumbleweed-order.patch
-Patch25:        add-opensuse-leap-15.4-support.patch
-Patch26:        add-sle15sp4-support.patch
-Patch27:        add-slem5.1-support.patch
-Patch28:        add-slem5.2-support.patch
-Patch29:        opensuse-autoyast-desktop.patch
-
 BuildRequires:  intltool
 BuildRequires:  osinfo-db-tools
+BuildArch:      noarch
 
 %description
 The osinfo database provides information about operating systems and
@@ -44,16 +38,7 @@ hypervisor platforms to facilitate the automated configuration and
 provisioning of new virtual machines
 
 %prep
-%setup -q
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
+%autosetup -p1
 
 %build
 cd %{_builddir}
@@ -63,7 +48,6 @@ tar -cJf x.tar.xz osinfo-db-%{version}
 osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo "%{_builddir}/x.tar.xz"
 
 %files
-%defattr(-,root,root,-)
 %dir %{_datadir}/osinfo/
 %{_datadir}/osinfo/VERSION
 %{_datadir}/osinfo/LICENSE