From 076c969ccf5c3c8c700b425fae42e983ca3b4a37df04e5cbc4919574e83db072 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 1 Jun 2020 19:13:02 +0000 Subject: [PATCH] - Update database to version 20200529 - Drop 5bbe30db-opensuse-add-info-about-UEFI-support.patch - bsc#1172008 - osinfo-db: Add support for openSUSE Leap 15.2 add-opensuse-leap-15.2-support.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=98 --- ...opensuse-add-info-about-UEFI-support.patch | 21 ------------------- SLE-add-info-about-UEFI-support.patch | 16 ++++++++------ add-win-2k19-media-info.patch | 8 +++---- fix-sle15sp1-volume-id-string.patch | 16 +++++++------- osinfo-db-20200214.tar.xz | 3 --- osinfo-db-20200529.tar.xz | 3 +++ osinfo-db.changes | 6 ++++++ osinfo-db.spec | 4 +--- 8 files changed, 32 insertions(+), 45 deletions(-) delete mode 100644 5bbe30db-opensuse-add-info-about-UEFI-support.patch delete mode 100644 osinfo-db-20200214.tar.xz create mode 100644 osinfo-db-20200529.tar.xz diff --git a/5bbe30db-opensuse-add-info-about-UEFI-support.patch b/5bbe30db-opensuse-add-info-about-UEFI-support.patch deleted file mode 100644 index 4485084..0000000 --- a/5bbe30db-opensuse-add-info-about-UEFI-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -Subject: opensuse: add info about UEFI support -From: Pino Toscano ptoscano@redhat.com Tue Mar 3 16:45:19 2020 +0100 -Date: Thu Mar 5 17:04:46 2020 +0000: -Git: 5bbe30db9c60fc1ae684b178faaefcc3888fba80 - -openSUSE supports UEFI on x86_64 since openSUSE 12.2: -https://en.opensuse.org/openSUSE:UEFI - -Signed-off-by: Pino Toscano - ---- osinfo-db-20200214.orig/os/opensuse.org/opensuse-12.2.xml -+++ osinfo-db-20200214/os/opensuse.org/opensuse-12.2.xml -@@ -32,6 +32,8 @@ - 2012-09-05 - 2014-01-15 - -+ -+ - - http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-DVD-i586.iso - diff --git a/SLE-add-info-about-UEFI-support.patch b/SLE-add-info-about-UEFI-support.patch index c4a5f98..d7cb096 100644 --- a/SLE-add-info-about-UEFI-support.patch +++ b/SLE-add-info-about-UEFI-support.patch @@ -1,6 +1,8 @@ ---- osinfo-db-20200214/os/suse.com/sles-12.2.xml.orig 2020-03-05 12:41:10.502641607 -0700 -+++ osinfo-db-20200214/os/suse.com/sles-12.2.xml 2020-03-05 12:39:25.061288659 -0700 -@@ -41,6 +41,8 @@ +Index: osinfo-db-20200529/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 @@ @@ -9,9 +11,11 @@ LINUX ---- osinfo-db-20200214/os/suse.com/sled-12.2.xml.orig 2020-03-05 12:38:06.540298601 -0700 -+++ osinfo-db-20200214/os/suse.com/sled-12.2.xml 2020-03-05 12:39:11.861122217 -0700 -@@ -41,6 +41,8 @@ +Index: osinfo-db-20200529/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 @@ diff --git a/add-win-2k19-media-info.patch b/add-win-2k19-media-info.patch index c899e17..7262351 100644 --- a/add-win-2k19-media-info.patch +++ b/add-win-2k19-media-info.patch @@ -1,8 +1,8 @@ -Index: osinfo-db-20200214/os/microsoft.com/win-2k19.xml +Index: osinfo-db-20200529/os/microsoft.com/win-2k19.xml =================================================================== ---- osinfo-db-20200214.orig/os/microsoft.com/win-2k19.xml -+++ osinfo-db-20200214/os/microsoft.com/win-2k19.xml -@@ -26,6 +26,23 @@ +--- osinfo-db-20200529.orig/os/microsoft.com/win-2k19.xml ++++ osinfo-db-20200529/os/microsoft.com/win-2k19.xml +@@ -29,6 +29,23 @@ 2018-10-02 diff --git a/fix-sle15sp1-volume-id-string.patch b/fix-sle15sp1-volume-id-string.patch index 66cc1b6..ff35cd8 100644 --- a/fix-sle15sp1-volume-id-string.patch +++ b/fix-sle15sp1-volume-id-string.patch @@ -1,8 +1,8 @@ -Index: osinfo-db-20200214/os/suse.com/sle-15.1.xml +Index: osinfo-db-20200529/os/suse.com/sle-15.1.xml =================================================================== ---- osinfo-db-20200214.orig/os/suse.com/sle-15.1.xml -+++ osinfo-db-20200214/os/suse.com/sle-15.1.xml -@@ -26,7 +26,7 @@ +--- 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 @@ LINUX @@ -11,7 +11,7 @@ Index: osinfo-db-20200214/os/suse.com/sle-15.1.xml boot/x86_64/loader/linux boot/x86_64/loader/initrd -@@ -35,7 +35,7 @@ +@@ -38,7 +38,7 @@ LINUX @@ -20,7 +20,7 @@ Index: osinfo-db-20200214/os/suse.com/sle-15.1.xml boot/aarch64/linux boot/aarch64/initrd -@@ -44,7 +44,7 @@ +@@ -47,7 +47,7 @@ LINUX @@ -29,7 +29,7 @@ Index: osinfo-db-20200214/os/suse.com/sle-15.1.xml boot/ppc64le/linux boot/ppc64le/initrd -@@ -53,7 +53,7 @@ +@@ -56,7 +56,7 @@ LINUX @@ -38,7 +38,7 @@ Index: osinfo-db-20200214/os/suse.com/sle-15.1.xml boot/s390x/linux boot/s390x/initrd -@@ -72,4 +72,4 @@ +@@ -75,4 +75,4 @@ diff --git a/osinfo-db-20200214.tar.xz b/osinfo-db-20200214.tar.xz deleted file mode 100644 index 26a0317..0000000 --- a/osinfo-db-20200214.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6659e4fefe29955ad5d566257bb082234b9165f2be27d6ca0c97ff89325aedba -size 99572 diff --git a/osinfo-db-20200529.tar.xz b/osinfo-db-20200529.tar.xz new file mode 100644 index 0000000..51f6f4e --- /dev/null +++ b/osinfo-db-20200529.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3620b5beed29bd7663fd35637ac209b0c7eeb12417ee1ea56150565e64727955 +size 104668 diff --git a/osinfo-db.changes b/osinfo-db.changes index 1647d02..08d79a7 100644 --- a/osinfo-db.changes +++ b/osinfo-db.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 1 12:47:43 MDT 2020 - carnold@suse.com + +- Update database to version 20200529 +- Drop 5bbe30db-opensuse-add-info-about-UEFI-support.patch + ------------------------------------------------------------------- Fri May 22 10:41:42 MDT 2020 - carnold@suse.com diff --git a/osinfo-db.spec b/osinfo-db.spec index 9f1ce46..ed956c0 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -17,7 +17,7 @@ Name: osinfo-db -Version: 20200214 +Version: 20200529 Release: 0 Summary: Osinfo database files License: LGPL-2.1+ and GPL-2.0+ @@ -25,7 +25,6 @@ Group: System/Management BuildArch: noarch Url: https://releases.pagure.org/libosinfo/ Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz -Patch1: 5bbe30db-opensuse-add-info-about-UEFI-support.patch Patch21: add-oes-support.patch Patch22: add-caasp40-support.patch Patch23: add-sle15sp2-support.patch @@ -43,7 +42,6 @@ provisioning of new virtual machines %prep %setup -q -%patch1 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1