From 7655d38ef1aa784fedf5f01e0349480adba4b93820544cc67ee857dfc173ab35 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 7 Aug 2020 15:54:56 +0000
Subject: [PATCH] - Update database to version 20200804 - Drop patches included
 in new tarball   add-opensuse-leap-15.2-support.patch  
 add-sle15sp2-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=100
---
 SLE-add-info-about-UEFI-support.patch |  26 +++---
 add-opensuse-leap-15.2-support.patch  | 125 --------------------------
 add-sle15sp2-support.patch            |  77 ----------------
 add-win-2k19-media-info.patch         |  13 ++-
 fix-sle15sp1-volume-id-string.patch   |  19 ++--
 fix-tumbleweed-order.patch            |  30 ++++---
 osinfo-db-20200529.tar.xz             |   3 -
 osinfo-db-20200804.tar.xz             |   3 +
 osinfo-db.changes                     |   8 ++
 osinfo-db.spec                        |   8 +-
 10 files changed, 55 insertions(+), 257 deletions(-)
 delete mode 100644 add-opensuse-leap-15.2-support.patch
 delete mode 100644 add-sle15sp2-support.patch
 delete mode 100644 osinfo-db-20200529.tar.xz
 create mode 100644 osinfo-db-20200804.tar.xz

diff --git a/SLE-add-info-about-UEFI-support.patch b/SLE-add-info-about-UEFI-support.patch
index d7cb096..44a7b1f 100644
--- a/SLE-add-info-about-UEFI-support.patch
+++ b/SLE-add-info-about-UEFI-support.patch
@@ -1,26 +1,24 @@
-Index: osinfo-db-20200529/os/suse.com/sles-12.2.xml
+Index: osinfo-db-20200804/os/suse.com/sles-12.2.xml
 ===================================================================
---- osinfo-db-20200529.orig/os/suse.com/sles-12.2.xml
-+++ osinfo-db-20200529/os/suse.com/sles-12.2.xml
-@@ -44,6 +44,8 @@
-       <device id="http://pcisig.com/pci/8086/293e"/> 
+--- 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 @@
+       <device id="http://pcisig.com/pci/8086/293e"/>
+       <!-- ich9-hda -->
      </devices>
- 
 +    <firmware arch="x86_64" type="efi"/>
-+
      <media arch="x86_64">
        <iso>
          <system-id>LINUX</system-id>
-Index: osinfo-db-20200529/os/suse.com/sled-12.2.xml
+Index: osinfo-db-20200804/os/suse.com/sled-12.2.xml
 ===================================================================
---- osinfo-db-20200529.orig/os/suse.com/sled-12.2.xml
-+++ osinfo-db-20200529/os/suse.com/sled-12.2.xml
-@@ -44,6 +44,8 @@
-       <device id="http://pcisig.com/pci/8086/293e"/> 
+--- 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 @@
+       <device id="http://pcisig.com/pci/8086/293e"/>
+       <!-- ich9-hda -->
      </devices>
- 
 +    <firmware arch="x86_64" type="efi"/>
-+
      <media arch="x86_64">
        <iso>
          <system-id>LINUX</system-id>
diff --git a/add-opensuse-leap-15.2-support.patch b/add-opensuse-leap-15.2-support.patch
deleted file mode 100644
index 007f1b3..0000000
--- a/add-opensuse-leap-15.2-support.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- /dev/null	2020-05-18 08:31:58.984168313 -0600
-+++ osinfo-db-20200214/os/opensuse.org/opensuse-15.2.xml	2020-05-22 10:39:56.073024784 -0600
-@@ -0,0 +1,122 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="http://opensuse.org/opensuse/15.2">
-+    <short-id>opensuse15.2</short-id>
-+    <name>openSUSE Leap 15.2</name>
-+    <name xml:lang="fr">openSUSE Leap 15.2</name>
-+    <name xml:lang="pl">openSUSE Leap 15.2</name>
-+    <name xml:lang="uk">openSUSE Leap 15.2</name>
-+    <version>15.2</version>
-+    <vendor>openSUSE</vendor>
-+    <vendor xml:lang="ca">openSUSE</vendor>
-+    <vendor xml:lang="de">openSUSE</vendor>
-+    <vendor xml:lang="es">openSUSE</vendor>
-+    <vendor xml:lang="fr">openSUSE</vendor>
-+    <vendor xml:lang="id">openSUSE</vendor>
-+    <vendor xml:lang="it">openSUSE</vendor>
-+    <vendor xml:lang="ja">openSUSE</vendor>
-+    <vendor xml:lang="pl">openSUSE</vendor>
-+    <vendor xml:lang="pt_BR">openSUSE</vendor>
-+    <vendor xml:lang="uk">openSUSE</vendor>
-+    <family>linux</family>
-+    <distro>opensuse</distro>
-+    <upgrades id="http://opensuse.org/opensuse/15.1"/>
-+    <derives-from id="http://opensuse.org/opensuse/15.1"/>
-+
-+    <release-date>2020-07-02</release-date>
-+
-+    <variant id="netinst">
-+      <name>openSUSE Leap 15.2</name>
-+      <name xml:lang="fr">openSUSE Leap 15.2</name>
-+      <name xml:lang="pl">openSUSE Leap 15.2</name>
-+      <name xml:lang="uk">openSUSE Leap 15.2</name>
-+    </variant>
-+
-+    
-+    <media arch="x86_64">
-+      <url>https://download.opensuse.org/distribution/leap/15.2/iso/openSUSE-Leap-15.2-DVD-x86_64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.2-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>
-+
-+    
-+    <media arch="x86_64">
-+      <variant id="netinst"/>
-+      <url>https://download.opensuse.org/distribution/leap/15.2/iso/openSUSE-Leap-15.2-NET-x86_64.iso</url>
-+      <iso>
-+        <volume-id>openSUSE-Leap-15.2-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>
-+
-+    
-+    <media live="true" installer-script="false" arch="x86_64">
-+      <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.2-GNOME-Live-x86_64-Current.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.2_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>
-+
-+    
-+    <media live="true" installer-script="false" arch="x86_64">
-+      <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.2-KDE-Live-x86_64-Current.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.2_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>
-+
-+    
-+    <media live="true" installer-script="false" arch="x86_64">
-+      <url>https://download.opensuse.org/distribution/leap/15.2/live/openSUSE-Leap-15.2-Rescue-CD-x86_64-Current.iso</url>
-+      <iso>
-+        <volume-id>openSUSE_Leap_15.2_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.2/repo/oss/</url>
-+      <treeinfo>
-+        <family>openSUSE Leap</family>
-+        <version>15.2</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-sle15sp2-support.patch b/add-sle15sp2-support.patch
deleted file mode 100644
index e91699c..0000000
--- a/add-sle15sp2-support.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: osinfo-db-20190805/os/suse.com/sle-15.2.xml
-===================================================================
---- /dev/null
-+++ osinfo-db-20190805/os/suse.com/sle-15.2.xml
-@@ -0,0 +1,72 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="http://suse.com/sle/15.2">
-+    <short-id>sle15sp2</short-id>
-+    <name>SUSE Linux Enterprise 15 SP2</name>
-+    <version>15.2</version>
-+    <vendor>SUSE</vendor>
-+    <vendor xml:lang="ca">SUSE</vendor>
-+    <vendor xml:lang="es">SUSE</vendor>
-+    <vendor xml:lang="fr">SUSE</vendor>
-+    <vendor xml:lang="id">SUSE</vendor>
-+    <vendor xml:lang="it">SUSE</vendor>
-+    <vendor xml:lang="pl">SUSE</vendor>
-+    <vendor xml:lang="uk">SUSE</vendor>
-+    <family>linux</family>
-+    <distro>sle</distro>
-+    <upgrades id="http://suse.com/sle/15.1"/>
-+    <derives-from id="http://suse.com/sle/15.1"/>
-+
-+    <release-date>2020-02-07</release-date>
-+
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>SLE-15-SP2.*-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-SP2.*-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-SP2.*-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-SP2.*-s390x.*</volume-id>
-+      </iso>
-+      <kernel>boot/s390x/linux</kernel>
-+      <initrd>boot/s390x/initrd</initrd>
-+    </media>
-+
-+    <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-win-2k19-media-info.patch b/add-win-2k19-media-info.patch
index 7262351..80e5e02 100644
--- a/add-win-2k19-media-info.patch
+++ b/add-win-2k19-media-info.patch
@@ -1,11 +1,11 @@
-Index: osinfo-db-20200529/os/microsoft.com/win-2k19.xml
+Index: osinfo-db-20200804/os/microsoft.com/win-2k19.xml
 ===================================================================
---- osinfo-db-20200529.orig/os/microsoft.com/win-2k19.xml
-+++ osinfo-db-20200529/os/microsoft.com/win-2k19.xml
-@@ -29,6 +29,23 @@
- 
+--- osinfo-db-20200804.orig/os/microsoft.com/win-2k19.xml
++++ osinfo-db-20200804/os/microsoft.com/win-2k19.xml
+@@ -30,6 +30,22 @@
+     <derives-from id="http://microsoft.com/win/2k16"/>
+     <upgrades id="http://microsoft.com/win/2k16"/>
      <release-date>2018-10-02</release-date>
- 
 +    <media arch="x86_64">
 +      <variant id="standard"/>
 +      <iso>
@@ -22,7 +22,6 @@ Index: osinfo-db-20200529/os/microsoft.com/win-2k19.xml
 +        <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>
diff --git a/fix-sle15sp1-volume-id-string.patch b/fix-sle15sp1-volume-id-string.patch
index ff35cd8..644d596 100644
--- a/fix-sle15sp1-volume-id-string.patch
+++ b/fix-sle15sp1-volume-id-string.patch
@@ -1,8 +1,8 @@
-Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
+Index: osinfo-db-20200804/os/suse.com/sle-15.1.xml
 ===================================================================
---- osinfo-db-20200529.orig/os/suse.com/sle-15.1.xml
-+++ osinfo-db-20200529/os/suse.com/sle-15.1.xml
-@@ -29,7 +29,7 @@
+--- 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 @@
      <media arch="x86_64">
        <iso>
          <system-id>LINUX</system-id>
@@ -11,7 +11,7 @@ Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
        </iso>
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
      <media arch="aarch64">
        <iso>
          <system-id>LINUX</system-id>
@@ -29,7 +29,7 @@ Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
        </iso>
        <kernel>boot/ppc64le/linux</kernel>
        <initrd>boot/ppc64le/initrd</initrd>
-@@ -56,7 +56,7 @@
+@@ -55,7 +55,7 @@
      <media arch="s390x">
        <iso>
          <system-id>LINUX</system-id>
@@ -38,10 +38,3 @@ Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml
        </iso>
        <kernel>boot/s390x/linux</kernel>
        <initrd>boot/s390x/initrd</initrd>
-@@ -75,4 +75,4 @@
-       </recommended>
-     </resources>
-   </os>
--</libosinfo>
-\ No newline at end of file
-+</libosinfo>
diff --git a/fix-tumbleweed-order.patch b/fix-tumbleweed-order.patch
index bd9d3b6..b127fd4 100644
--- a/fix-tumbleweed-order.patch
+++ b/fix-tumbleweed-order.patch
@@ -1,11 +1,11 @@
-Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
+Index: osinfo-db-20200804/os/opensuse.org/opensuse-tumbleweed.xml
 ===================================================================
---- osinfo-db-20200529.orig/os/opensuse.org/opensuse-tumbleweed.xml	2020-05-29 13:07:41.000000000 +0200
-+++ osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml	2020-07-01 09:04:20.344096387 +0200
-@@ -51,16 +51,6 @@
+--- osinfo-db-20200804.orig/os/opensuse.org/opensuse-tumbleweed.xml
++++ osinfo-db-20200804/os/opensuse.org/opensuse-tumbleweed.xml
+@@ -54,16 +54,6 @@
+       <name xml:lang="fr">openSUSE Tumbleweed (Kubic)</name>
      </variant>
- 
-     
+     <!-- DVD Image -->
 -    <media arch="i686">
 -      <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-DVD-i586-Current.iso</url>
 -      <iso>
@@ -19,12 +19,11 @@ Index: osinfo-db-20200529/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>
-@@ -71,13 +61,10 @@
+@@ -74,18 +64,17 @@
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
      </media>
--
--    
+-    <!-- Network Image -->
      <media arch="i686">
 -      <variant id="netinst"/>
 -      <url>http://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-i586-Current.iso</url>
@@ -35,7 +34,14 @@ Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
          <system-id>LINUX</system-id>
          <publisher-id>SUSE LINUX GmbH</publisher-id>
        </iso>
-@@ -95,6 +84,17 @@
+       <kernel>boot/i386/loader/linux</kernel>
+       <initrd>boot/i386/loader/initrd</initrd>
+     </media>
++    <!-- Network Image -->
+     <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 @@
        <kernel>boot/x86_64/loader/linux</kernel>
        <initrd>boot/x86_64/loader/initrd</initrd>
      </media>
@@ -50,6 +56,6 @@ Index: osinfo-db-20200529/os/opensuse.org/opensuse-tumbleweed.xml
 +      <kernel>boot/i386/loader/linux</kernel>
 +      <initrd>boot/i386/loader/initrd</initrd>
 +    </media>
- 
-     
+     <!-- Kubic -->
      <media arch="x86_64">
+       <variant id="kubic"/>
diff --git a/osinfo-db-20200529.tar.xz b/osinfo-db-20200529.tar.xz
deleted file mode 100644
index 51f6f4e..0000000
--- a/osinfo-db-20200529.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3620b5beed29bd7663fd35637ac209b0c7eeb12417ee1ea56150565e64727955
-size 104668
diff --git a/osinfo-db-20200804.tar.xz b/osinfo-db-20200804.tar.xz
new file mode 100644
index 0000000..8cb8393
--- /dev/null
+++ b/osinfo-db-20200804.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b7c8040f3b576857b305aebab90cb567b65117e7dbf930770e2cf40fcf4a8bf
+size 112204
diff --git a/osinfo-db.changes b/osinfo-db.changes
index a8b7c6f..3d7d13c 100644
--- a/osinfo-db.changes
+++ b/osinfo-db.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Aug  7 09:21:27 MDT 2020 - carnold@suse.com
+
+- Update database to version 20200804
+- Drop patches included in new tarball
+  add-opensuse-leap-15.2-support.patch
+  add-sle15sp2-support.patch
+
 -------------------------------------------------------------------
 Wed Jul  1 07:06:24 UTC 2020 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/osinfo-db.spec b/osinfo-db.spec
index bb5e186..3d6c5ce 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -17,7 +17,7 @@
 
 
 Name:           osinfo-db
-Version:        20200529
+Version:        20200804
 Release:        0
 Summary:        Osinfo database files
 License:        LGPL-2.1+ and GPL-2.0+
@@ -27,12 +27,10 @@ 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-sle15sp2-support.patch
 Patch24:        add-win-2k19-media-info.patch
 Patch25:        fix-sle15sp1-volume-id-string.patch
 Patch26:        SLE-add-info-about-UEFI-support.patch
-Patch27:        add-opensuse-leap-15.2-support.patch
-Patch28:	fix-tumbleweed-order.patch
+Patch27:        fix-tumbleweed-order.patch
 BuildRequires:  intltool
 BuildRequires:  osinfo-db-tools
 
@@ -45,12 +43,10 @@ provisioning of new virtual machines
 %setup -q
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
 
 %build
 cd %{_builddir}