From 1a5a293332f3aaebd051e0deb17e4a5fb33b62aa2dc87bf6b015c6fc84a99cfe Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 11 Jun 2021 21:39:05 +0000
Subject: [PATCH] - Update to database version 20210531  
 osinfo-db-20210531.tar.xz - Drop add-leap15.3-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=109
---
 SLE-add-info-about-UEFI-support.patch |  16 ++--
 add-leap15.3-support.patch            | 121 --------------------------
 add-win-2k19-media-info.patch         |   8 +-
 fix-sle15sp1-volume-id-string.patch   |  14 +--
 fix-tumbleweed-order.patch            |  12 +--
 osinfo-db-20210312.tar.xz             |   3 -
 osinfo-db-20210531.tar.xz             |   3 +
 osinfo-db.changes                     |   7 ++
 osinfo-db.spec                        |  10 +--
 9 files changed, 39 insertions(+), 155 deletions(-)
 delete mode 100644 add-leap15.3-support.patch
 delete mode 100644 osinfo-db-20210312.tar.xz
 create mode 100644 osinfo-db-20210531.tar.xz

diff --git a/SLE-add-info-about-UEFI-support.patch b/SLE-add-info-about-UEFI-support.patch
index 44a7b1f..3c39ea8 100644
--- a/SLE-add-info-about-UEFI-support.patch
+++ b/SLE-add-info-about-UEFI-support.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20200804/os/suse.com/sles-12.2.xml
+Index: osinfo-db-20210531/os/suse.com/sles-12.2.xml
 ===================================================================
---- osinfo-db-20200804.orig/os/suse.com/sles-12.2.xml
-+++ osinfo-db-20200804/os/suse.com/sles-12.2.xml
-@@ -56,6 +56,7 @@
+--- osinfo-db-20210531.orig/os/suse.com/sles-12.2.xml
++++ osinfo-db-20210531/os/suse.com/sles-12.2.xml
+@@ -58,6 +58,7 @@
        <device id="http://pcisig.com/pci/8086/293e"/>
        <!-- ich9-hda -->
      </devices>
@@ -10,11 +10,11 @@ Index: osinfo-db-20200804/os/suse.com/sles-12.2.xml
      <media arch="x86_64">
        <iso>
          <system-id>LINUX</system-id>
-Index: osinfo-db-20200804/os/suse.com/sled-12.2.xml
+Index: osinfo-db-20210531/os/suse.com/sled-12.2.xml
 ===================================================================
---- osinfo-db-20200804.orig/os/suse.com/sled-12.2.xml
-+++ osinfo-db-20200804/os/suse.com/sled-12.2.xml
-@@ -56,6 +56,7 @@
+--- osinfo-db-20210531.orig/os/suse.com/sled-12.2.xml
++++ osinfo-db-20210531/os/suse.com/sled-12.2.xml
+@@ -58,6 +58,7 @@
        <device id="http://pcisig.com/pci/8086/293e"/>
        <!-- ich9-hda -->
      </devices>
diff --git a/add-leap15.3-support.patch b/add-leap15.3-support.patch
deleted file mode 100644
index c20c68f..0000000
--- a/add-leap15.3-support.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- /dev/null	2020-08-13 09:44:36.280214894 -0600
-+++ osinfo-db-20200804/os/opensuse.org/opensuse-15.3.xml	2020-08-14 11:13:33.778400872 -0600
-@@ -0,0 +1,118 @@
-+<?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.3">
-+    <short-id>opensuse15.3</short-id>
-+    <name>openSUSE Leap 15.3</name>
-+    <name xml:lang="uk">openSUSE Leap 15.3</name>
-+    <name xml:lang="tr">openSUSE Leap 15.3</name>
-+    <name xml:lang="pl">openSUSE Leap 15.3</name>
-+    <name xml:lang="it">openSUSE Leap 15.3</name>
-+    <name xml:lang="fr">openSUSE Leap 15.3</name>
-+    <version>15.3</version>
-+    <vendor>openSUSE</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>2021-07-01</release-date>
-+    <variant id="netinst">
-+      <name>openSUSE Leap 15.3</name>
-+      <name xml:lang="uk">openSUSE Leap 15.3</name>
-+      <name xml:lang="tr">openSUSE Leap 15.3</name>
-+      <name xml:lang="pl">openSUSE Leap 15.3</name>
-+      <name xml:lang="it">openSUSE Leap 15.3</name>
-+      <name xml:lang="fr">openSUSE Leap 15.3</name>
-+    </variant>
-+    <!-- DVD -->
-+    <media arch="x86_64">
-+      <url>https://download.opensuse.org/distribution/leap/15.3/iso/openSUSE-Leap-15.3-DVD-x86_64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.3-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.3/iso/openSUSE-Leap-15.3-NET-x86_64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.3-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>
-+    <!-- Live GNOME -->
-+    <media arch="x86_64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.3/live/openSUSE-Leap-15.3-GNOME-Live-x86_64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.3_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 KDE -->
-+    <media arch="x86_64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.3/live/openSUSE-Leap-15.3-KDE-Live-x86_64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.3_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 Rescue CD -->
-+    <media arch="x86_64" live="true" installer-script="false">
-+      <url>https://download.opensuse.org/distribution/leap/15.3/live/openSUSE-Leap-15.3-Rescue-CD-x86_64-Media.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.3_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>
-+    <tree arch="x86_64">
-+      <url>https://download.opensuse.org/pub/opensuse/distribution/leap/15.3/repo/oss/</url>
-+      <treeinfo>
-+        <family>openSUSE Leap</family>
-+        <version>15.3</version>
-+        <arch>x86_64</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-win-2k19-media-info.patch b/add-win-2k19-media-info.patch
index 1b1ab4e..ac50106 100644
--- a/add-win-2k19-media-info.patch
+++ b/add-win-2k19-media-info.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20201218/os/microsoft.com/win-2k19.xml
+Index: osinfo-db-20210531/os/microsoft.com/win-2k19.xml
 ===================================================================
---- osinfo-db-20201218.orig/os/microsoft.com/win-2k19.xml
-+++ osinfo-db-20201218/os/microsoft.com/win-2k19.xml
-@@ -31,6 +31,22 @@
+--- osinfo-db-20210531.orig/os/microsoft.com/win-2k19.xml
++++ osinfo-db-20210531/os/microsoft.com/win-2k19.xml
+@@ -33,6 +33,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-sle15sp1-volume-id-string.patch b/fix-sle15sp1-volume-id-string.patch
index 644d596..0e14cbe 100644
--- a/fix-sle15sp1-volume-id-string.patch
+++ b/fix-sle15sp1-volume-id-string.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20200804/os/suse.com/sle-15.1.xml
+Index: osinfo-db-20210531/os/suse.com/sle-15.1.xml
 ===================================================================
---- osinfo-db-20200804.orig/os/suse.com/sle-15.1.xml
-+++ osinfo-db-20200804/os/suse.com/sle-15.1.xml
-@@ -31,7 +31,7 @@
+--- osinfo-db-20210531.orig/os/suse.com/sle-15.1.xml
++++ osinfo-db-20210531/os/suse.com/sle-15.1.xml
+@@ -33,7 +33,7 @@
      <media arch="x86_64">
        <iso>
          <system-id>LINUX</system-id>
@@ -11,7 +11,7 @@ Index: osinfo-db-20200804/os/suse.com/sle-15.1.xml
        </iso>
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
-@@ -39,7 +39,7 @@
+@@ -41,7 +41,7 @@
      <media arch="aarch64">
        <iso>
          <system-id>LINUX</system-id>
@@ -20,7 +20,7 @@ Index: osinfo-db-20200804/os/suse.com/sle-15.1.xml
        </iso>
        <kernel>boot/aarch64/linux</kernel>
        <initrd>boot/aarch64/initrd</initrd>
-@@ -47,7 +47,7 @@
+@@ -49,7 +49,7 @@
      <media arch="ppc64">
        <iso>
          <system-id>LINUX</system-id>
@@ -29,7 +29,7 @@ Index: osinfo-db-20200804/os/suse.com/sle-15.1.xml
        </iso>
        <kernel>boot/ppc64le/linux</kernel>
        <initrd>boot/ppc64le/initrd</initrd>
-@@ -55,7 +55,7 @@
+@@ -57,7 +57,7 @@
      <media arch="s390x">
        <iso>
          <system-id>LINUX</system-id>
diff --git a/fix-tumbleweed-order.patch b/fix-tumbleweed-order.patch
index b127fd4..b257156 100644
--- a/fix-tumbleweed-order.patch
+++ b/fix-tumbleweed-order.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20200804/os/opensuse.org/opensuse-tumbleweed.xml
+Index: osinfo-db-20210531/os/opensuse.org/opensuse-tumbleweed.xml
 ===================================================================
---- osinfo-db-20200804.orig/os/opensuse.org/opensuse-tumbleweed.xml
-+++ osinfo-db-20200804/os/opensuse.org/opensuse-tumbleweed.xml
-@@ -54,16 +54,6 @@
+--- osinfo-db-20210531.orig/os/opensuse.org/opensuse-tumbleweed.xml
++++ osinfo-db-20210531/os/opensuse.org/opensuse-tumbleweed.xml
+@@ -58,16 +58,6 @@
        <name xml:lang="fr">openSUSE Tumbleweed (Kubic)</name>
      </variant>
      <!-- DVD Image -->
@@ -19,7 +19,7 @@ Index: osinfo-db-20200804/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>
-@@ -74,18 +64,17 @@
+@@ -78,18 +68,17 @@
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
      </media>
@@ -41,7 +41,7 @@ Index: osinfo-db-20200804/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>
-@@ -97,6 +86,17 @@
+@@ -101,6 +90,17 @@
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
      </media>
diff --git a/osinfo-db-20210312.tar.xz b/osinfo-db-20210312.tar.xz
deleted file mode 100644
index 82d556b..0000000
--- a/osinfo-db-20210312.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7548ec09e445ca7378c5ceb99e39edca8857f8293831e0b3cb558f4230870e10
-size 113832
diff --git a/osinfo-db-20210531.tar.xz b/osinfo-db-20210531.tar.xz
new file mode 100644
index 0000000..315e536
--- /dev/null
+++ b/osinfo-db-20210531.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e46d769692e5bd985abe2e376209adafec33db77f10b35999c71b7a140963ec0
+size 118600
diff --git a/osinfo-db.changes b/osinfo-db.changes
index 4fef45a..d83968c 100644
--- a/osinfo-db.changes
+++ b/osinfo-db.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 11 15:24:39 MDT 2021 - carnold@suse.com
+
+- Update to database version 20210531
+  osinfo-db-20210531.tar.xz
+- Drop add-leap15.3-support.patch
+
 -------------------------------------------------------------------
 Mon Apr 12 13:01:27 MDT 2021 - carnold@suse.com
 
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 6d1e223..5c7d8e8 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -17,7 +17,7 @@
 
 
 Name:           osinfo-db
-Version:        20210312
+Version:        20210531
 Release:        0
 Summary:        Osinfo database files
 License:        LGPL-2.1+ and GPL-2.0+
@@ -31,10 +31,9 @@ Patch24:        add-win-2k19-media-info.patch
 Patch25:        fix-sle15sp1-volume-id-string.patch
 Patch26:        SLE-add-info-about-UEFI-support.patch
 Patch27:        fix-tumbleweed-order.patch
-Patch28:        add-leap15.3-support.patch
-Patch29:        add-sle15sp3-support.patch
-Patch30:        fix-autoyast-validation.patch
-Patch31:        add-slem50-support.patch
+Patch28:        add-sle15sp3-support.patch
+Patch29:        fix-autoyast-validation.patch
+Patch30:        add-slem50-support.patch
 
 BuildRequires:  intltool
 BuildRequires:  osinfo-db-tools
@@ -55,7 +54,6 @@ provisioning of new virtual machines
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
 
 %build
 cd %{_builddir}