diff --git a/add-sle12sp5-support.patch b/add-sle12sp5-support.patch deleted file mode 100644 index d9c0755..0000000 --- a/add-sle12sp5-support.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: osinfo-db-20181116/os/suse.com/sles-12.5.xml -=================================================================== ---- /dev/null -+++ osinfo-db-20181116/os/suse.com/sles-12.5.xml -@@ -0,0 +1,83 @@ -+ -+ -+ -+ -+ sles12sp5 -+ SUSE Linux Enterprise Server 12 SP5 -+ 12.5 -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ linux -+ sles -+ -+ -+ -+ 2019-12-06 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ LINUX -+ SLE-12-SP5-Server-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -+ -+ LINUX -+ SLE-12-SP5-Server-DVD-aarch64 -+ -+ boot/aarch64/linux -+ boot/aarch64/initrd -+ -+ -+ -+ -+ LINUX -+ SLE-12-SP5-Server-DVD-ppc64le -+ -+ boot/ppc64le/linux -+ boot/ppc64le/initrd -+ -+ -+ -+ -+ LINUX -+ SLE-12-SP5-Server-DVD-s390x -+ -+ boot/s390x/linux -+ boot/s390x/initrd -+ -+ -+ -+ -+ 500000000 -+ 536870912 -+ 1074151424 -+ -+ -+ 2400000000 -+ 1073741824 -+ 17179869184 -+ -+ -+ -+ -Index: osinfo-db-20181116/os/suse.com/sled-12.5.xml -=================================================================== ---- /dev/null -+++ osinfo-db-20181116/os/suse.com/sled-12.5.xml -@@ -0,0 +1,56 @@ -+ -+ -+ -+ -+ sled12sp5 -+ SUSE Linux Enterprise Desktop 12 SP5 -+ 12.5 -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ SUSE -+ linux -+ sled -+ -+ -+ -+ 2019-06-13 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ LINUX -+ SLE-12-SP5-Desktop-DVD-x86_64 -+ -+ boot/x86_64/loader/linux -+ boot/x86_64/loader/initrd -+ -+ -+ -+ -+ 500000000 -+ 536870912 -+ 1074151424 -+ -+ -+ 2400000000 -+ 1073741824 -+ 17179869184 -+ -+ -+ -+ diff --git a/add-win-2k19-media-info.patch b/add-win-2k19-media-info.patch index f0797cf..c899e17 100644 --- a/add-win-2k19-media-info.patch +++ b/add-win-2k19-media-info.patch @@ -1,6 +1,8 @@ ---- osinfo-db-20191125/os/microsoft.com/win-2k19.xml.orig 2020-01-02 10:26:41.198381885 -0700 -+++ osinfo-db-20191125/os/microsoft.com/win-2k19.xml 2020-01-02 10:31:53.274389322 -0700 -@@ -23,6 +23,23 @@ +Index: osinfo-db-20200214/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 @@ 2018-10-02 diff --git a/fix-sle15sp1-volume-id-string.patch b/fix-sle15sp1-volume-id-string.patch index faddd2c..66cc1b6 100644 --- a/fix-sle15sp1-volume-id-string.patch +++ b/fix-sle15sp1-volume-id-string.patch @@ -1,8 +1,8 @@ -Index: osinfo-db-20190805/os/suse.com/sle-15.1.xml +Index: osinfo-db-20200214/os/suse.com/sle-15.1.xml =================================================================== ---- osinfo-db-20190805.orig/os/suse.com/sle-15.1.xml -+++ osinfo-db-20190805/os/suse.com/sle-15.1.xml -@@ -23,7 +23,7 @@ +--- 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 @@ LINUX @@ -11,7 +11,7 @@ Index: osinfo-db-20190805/os/suse.com/sle-15.1.xml boot/x86_64/loader/linux boot/x86_64/loader/initrd -@@ -32,7 +32,7 @@ +@@ -35,7 +35,7 @@ LINUX @@ -20,7 +20,7 @@ Index: osinfo-db-20190805/os/suse.com/sle-15.1.xml boot/aarch64/linux boot/aarch64/initrd -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ LINUX @@ -29,7 +29,7 @@ Index: osinfo-db-20190805/os/suse.com/sle-15.1.xml boot/ppc64le/linux boot/ppc64le/initrd -@@ -50,7 +50,7 @@ +@@ -53,7 +53,7 @@ LINUX @@ -38,7 +38,7 @@ Index: osinfo-db-20190805/os/suse.com/sle-15.1.xml boot/s390x/linux boot/s390x/initrd -@@ -69,4 +69,4 @@ +@@ -72,4 +72,4 @@ diff --git a/osinfo-db-20191125.tar.xz b/osinfo-db-20191125.tar.xz deleted file mode 100644 index 37f17d7..0000000 --- a/osinfo-db-20191125.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8f4e8c3e3ee738191511a4549fc8e4895b501312f2a7d383d5bde72a76f5580 -size 94576 diff --git a/osinfo-db-20200214.tar.xz b/osinfo-db-20200214.tar.xz new file mode 100644 index 0000000..26a0317 --- /dev/null +++ b/osinfo-db-20200214.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6659e4fefe29955ad5d566257bb082234b9165f2be27d6ca0c97ff89325aedba +size 99572 diff --git a/osinfo-db.changes b/osinfo-db.changes index 53aaead..e27bf3a 100644 --- a/osinfo-db.changes +++ b/osinfo-db.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 3 11:20:15 MST 2020 - carnold@suse.com + +- Update database to version 20200214 + osinfo-db-20200214.tar.xz +- Drop patch included in new tarball + add-sle12sp5-support.patch + ------------------------------------------------------------------- Wed Feb 26 15:12:25 MST 2020 - carnold@suse.com diff --git a/osinfo-db.spec b/osinfo-db.spec index 3af4e95..ef9c53e 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -17,7 +17,7 @@ Name: osinfo-db -Version: 20191125 +Version: 20200214 Release: 0 Summary: Osinfo database files License: LGPL-2.1+ and GPL-2.0+ @@ -27,10 +27,9 @@ Url: https://releases.pagure.org/libosinfo/ Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz Patch21: add-oes-support.patch Patch22: add-caasp40-support.patch -Patch23: add-sle12sp5-support.patch -Patch24: add-sle15sp2-support.patch -Patch25: add-win-2k19-media-info.patch -Patch26: fix-sle15sp1-volume-id-string.patch +Patch23: add-sle15sp2-support.patch +Patch24: add-win-2k19-media-info.patch +Patch25: fix-sle15sp1-volume-id-string.patch BuildRequires: intltool BuildRequires: osinfo-db-tools @@ -46,7 +45,6 @@ provisioning of new virtual machines %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 %build cd %{_builddir}