diff --git a/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch b/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch new file mode 100644 index 0000000..c2c4e09 --- /dev/null +++ b/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch @@ -0,0 +1,154 @@ +From e7a1af1fd70ceaa4b013ea6186a5c3ca7a47e3e0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Wed, 29 May 2019 07:54:04 +0200 +Subject: [PATCH] rhel-8.0: Update entry to also match 8.0.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabiano Fidêncio +--- + os/redhat.com/rhel-8.0.xml | 94 +++++++++++++++++++++++++++++++++++--- + 1 file changed, 88 insertions(+), 6 deletions(-) + +diff --git a/os/redhat.com/rhel-8.0.xml b/os/redhat.com/rhel-8.0.xml +index a0faf1b..37033c0 100644 +--- a/os/redhat.com/rhel-8.0.xml ++++ b/os/redhat.com/rhel-8.0.xml +@@ -11,19 +11,46 @@ + Red Hat, Inc + Red Hat, Inc + Red Hat, Inc ++ Red Hat, Inc + Red Hat, Inc + Red Hat, Inc + Red Hat, Inc + Red Hat, Inc + linux + rhel +- +- ++ Ootpa ++ ++ ++ 2018-05-07 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + LINUX +- RHEL-8-0-BaseOS-x86_64 ++ RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64 + + isolinux/vmlinuz + isolinux/initrd.img +@@ -32,7 +59,7 @@ + + + PPC +- RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le ++ RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le + + ppc/ppc64/vmlinuz + ppc/ppc64/initrd.img +@@ -41,17 +68,72 @@ + + + LINUX +- RHEL-8-0-BaseOS-aarch64 ++ RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64 + + + + + + LINUX +- RHEL-8-0-BaseOS-s390x ++ RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x + + + ++ ++ ++ Red Hat Enterprise Linux ++ ^8.0(.([0-9]|[1-9][0-9]))?$ ++ aarch64 ++ ++ ++ ++ ++ ++ Red Hat Enterprise Linux ++ ^8.0(.([0-9]|[1-9][0-9]))?$ ++ ppc64le ++ ++ ++ ++ ++ ++ Red Hat Enterprise Linux ++ ^8.0(.([0-9]|[1-9][0-9]))?$ ++ s390x ++ ++ ++ ++ ++ ++ Red Hat Enterprise Linux ++ ^8.0(.([0-9]|[1-9][0-9]))?$ ++ x86_64 ++ ++ ++ ++ ++ ++ Red Hat Enterprise Linux ++ ^8.0(.([0-9]|[1-9][0-9]))?$ ++ aarch64 ++ ++ ++ ++ ++ ++ 1 ++ 1000000000 ++ 2147483648 ++ 10737418240 ++ ++ ++ ++ 4000000000 ++ 2147483648 ++ 21474836480 ++ ++ ++ + + + 1 +-- +2.21.0 + diff --git a/SOURCES/0011-win-Add-win-2k19-entry.patch b/SOURCES/0011-win-Add-win-2k19-entry.patch new file mode 100644 index 0000000..beca9e7 --- /dev/null +++ b/SOURCES/0011-win-Add-win-2k19-entry.patch @@ -0,0 +1,65 @@ +From ef0ed26150d8eab03a00d7f11a955dcfb863d7af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Wed, 29 May 2019 07:55:58 +0200 +Subject: [PATCH] win: Add win-2k19 entry +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fabiano Fidêncio +--- + os/microsoft.com/win-2k19.xml | 42 +++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + create mode 100644 os/microsoft.com/win-2k19.xml + +diff --git a/os/microsoft.com/win-2k19.xml b/os/microsoft.com/win-2k19.xml +new file mode 100644 +index 0000000..b6ce0c9 +--- /dev/null ++++ b/os/microsoft.com/win-2k19.xml +@@ -0,0 +1,42 @@ ++ ++ ++ ++ ++ win2k19 ++ Microsoft Windows Server 2019 ++ 10.0 ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Microsoft Corporation ++ Корпорація Microsoft ++ winnt ++ win ++ ++ ++ ++ 2018-10-02 ++ ++ ++ ++ 1400000000 ++ 1 ++ 536870912 ++ 34359738368 ++ ++ ++ ++ 2000000000 ++ 2147483648 ++ 42949672960 ++ ++ ++ ++ ++ +-- +2.21.0 + diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec index 149aab8..b35eb4d 100644 --- a/SPECS/osinfo-db.spec +++ b/SPECS/osinfo-db.spec @@ -5,7 +5,7 @@ Summary: osinfo database files Name: osinfo-db Version: 20181011 -Release: 8%{?dist} +Release: 8%{?dist}.1 License: LGPLv2+ Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc @@ -25,6 +25,8 @@ Patch0006: 0006-fedora-Update-f29-data.patch Patch0007: 0007-silverblue-Update-silverblue29-data.patch Patch0008: 0008-ubuntu18.10-Update-data-after-release.patch Patch0009: 0009-silverblue-Adjust-ostree-ref-name-for-f29.patch +Patch0010: 0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch +Patch0011: 0011-win-Add-win-2k19-entry.patch %description The osinfo database provides information about operating systems and @@ -63,6 +65,10 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource} %{_datadir}/osinfo/schema %changelog +* Wed May 29 2019 Fabiano Fidêncio - 20181011-8.1 +- Resolves: rhbz#1714755 - rhel-8.0.x is not detected as rhel-8.0 +- Resolves: rhbz#1714748 - Add win2019 to libosinfo + * Fri Dec 07 2018 Fabiano Fidêncio - 20181011-8 - Resolves: rhbz#1656917 - backport change to support Fedora 29 Silverblue