diff --git a/SLE-add-info-about-UEFI-support.patch b/SLE-add-info-about-UEFI-support.patch deleted file mode 100644 index 3c39ea8..0000000 --- a/SLE-add-info-about-UEFI-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: osinfo-db-20210531/os/suse.com/sles-12.2.xml -=================================================================== ---- 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 @@ - - - -+ - - - LINUX -Index: osinfo-db-20210531/os/suse.com/sled-12.2.xml -=================================================================== ---- 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 @@ - - - -+ - - - LINUX diff --git a/add-sle15sp3-support.patch b/add-sle15sp3-support.patch deleted file mode 100644 index ceff5bd..0000000 --- a/add-sle15sp3-support.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- /dev/null 2020-08-13 09:44:36.280214894 -0600 -+++ osinfo-db-20200804/os/suse.com/sle-15.3.xml 2020-08-14 11:14:08.626401702 -0600 -@@ -0,0 +1,69 @@ -+ -+ -+ -+ -+ sle15sp3 -+ SUSE Linux Enterprise 15 SP3 -+ 15.3 -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ linux -+ sle -+ -+ -+ 2021-07-01 -+ -+ -+ LINUX -+ SLE-15-SP3.*-x86_64.* -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -+ LINUX -+ SLE-15-SP3.*-aarch64.* -+ -+ boot/aarch64/linux -+ boot/aarch64/initrd -+ -+ -+ -+ LINUX -+ SLE-15-SP3.*-ppc64le.* -+ -+ boot/ppc64le/linux -+ boot/ppc64le/initrd -+ -+ -+ -+ LINUX -+ SLE-15-SP3.*-s390x.* -+ -+ boot/s390x/linux -+ boot/s390x/initrd -+ -+ -+ -+ 500000000 -+ 536870912 -+ 1074151424 -+ -+ -+ 2400000000 -+ 1073741824 -+ 17179869184 -+ -+ -+ -+ diff --git a/add-slem50-support.patch b/add-slem50-support.patch deleted file mode 100644 index 92d4b4a..0000000 --- a/add-slem50-support.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- /dev/null 2021-04-12 05:13:46.896144305 -0600 -+++ osinfo-db-20210312/os/suse.com/slem-5.0.xml 2021-04-12 13:08:47.736823441 -0600 -@@ -0,0 +1,44 @@ -+ -+ -+ -+ -+ slem5.0 -+ SUSE Linux Enterprise Micro -+ 5.0 -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ linux -+ slem -+ -+ 2021-04-08 -+ -+ -+ -+ LINUX -+ SUSE-MicroOS-5.0-DVD-x86_6489.4 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -+ -+ 500000000 -+ 1073741824 -+ 12884901888 -+ -+ -+ 2400000000 -+ 4294967296 -+ 64424509440 -+ -+ -+ -+ diff --git a/fix-sle15sp1-volume-id-string.patch b/fix-sle15sp1-volume-id-string.patch deleted file mode 100644 index 0e14cbe..0000000 --- a/fix-sle15sp1-volume-id-string.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: osinfo-db-20210531/os/suse.com/sle-15.1.xml -=================================================================== ---- 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 @@ - - - LINUX -- SLE-15-SP1-Installer-DVD-x86\.001 -+ SLE-15-SP1-Installer-DVD-x86.* - - boot/x86_64/loader/linux - boot/x86_64/loader/initrd -@@ -41,7 +41,7 @@ - - - LINUX -- SLE-15-SP1-Installer-DVD-aar\.001 -+ SLE-15-SP1-Installer-DVD-aar.* - - boot/aarch64/linux - boot/aarch64/initrd -@@ -49,7 +49,7 @@ - - - LINUX -- SLE-15-SP1-Installer-DVD-ppc\.001 -+ SLE-15-SP1-Installer-DVD-ppc.* - - boot/ppc64le/linux - boot/ppc64le/initrd -@@ -57,7 +57,7 @@ - - - LINUX -- SLE-15-SP1-Installer-DVD-s39\.001 -+ SLE-15-SP1-Installer-DVD-s39.* - - boot/s390x/linux - boot/s390x/initrd diff --git a/osinfo-db-20210531.tar.xz b/osinfo-db-20210531.tar.xz deleted file mode 100644 index 315e536..0000000 --- a/osinfo-db-20210531.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e46d769692e5bd985abe2e376209adafec33db77f10b35999c71b7a140963ec0 -size 118600 diff --git a/osinfo-db-20210621.tar.xz b/osinfo-db-20210621.tar.xz new file mode 100644 index 0000000..95223dd --- /dev/null +++ b/osinfo-db-20210621.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219 +size 118292 diff --git a/osinfo-db.changes b/osinfo-db.changes index d83968c..2f95611 100644 --- a/osinfo-db.changes +++ b/osinfo-db.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 21 09:42:36 MDT 2021 - carnold@suse.com + +- Update to database version 20210621 + osinfo-db-20210621.tar.xz +- Drop patches contained in new tarball + SLE-add-info-about-UEFI-support.patch + add-sle15sp3-support.patch + add-slem50-support.patch + fix-sle15sp1-volume-id-string.patch + ------------------------------------------------------------------- Fri Jun 11 15:24:39 MDT 2021 - carnold@suse.com diff --git a/osinfo-db.spec b/osinfo-db.spec index 5c7d8e8..10e1ca3 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -17,7 +17,7 @@ Name: osinfo-db -Version: 20210531 +Version: 20210621 Release: 0 Summary: Osinfo database files License: LGPL-2.1+ and GPL-2.0+ @@ -27,13 +27,9 @@ 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 -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-sle15sp3-support.patch -Patch29: fix-autoyast-validation.patch -Patch30: add-slem50-support.patch +Patch23: add-win-2k19-media-info.patch +Patch24: fix-tumbleweed-order.patch +Patch25: fix-autoyast-validation.patch BuildRequires: intltool BuildRequires: osinfo-db-tools @@ -47,13 +43,9 @@ provisioning of new virtual machines %setup -q %patch21 -p1 %patch22 -p1 +%patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 %build cd %{_builddir}