From 06caa4d63b83d80de59dfec1d656f7d5a347240c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 15 Feb 2021 11:50:19 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/osinfo-db.git#49b8f1a292202579a92d6ef11c7f84995a453fa1 --- .gitignore | 1 + osinfo-db.spec | 10 +++++++++- sources | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0f3d5f0..82067c4 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /osinfo-db-20201119.tar.xz.asc /osinfo-db-20201218.tar.xz.asc /osinfo-db-20210202.tar.xz.asc +/osinfo-db-20210215.tar.xz.asc diff --git a/osinfo-db.spec b/osinfo-db.spec index 9315e1f..b28bf9d 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -2,7 +2,7 @@ Summary: osinfo database files Name: osinfo-db -Version: 20210202 +Version: 20210215 Release: 1%{?dist} License: LGPLv2+ Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz @@ -20,6 +20,10 @@ provisioning of new virtual machines %install osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0} +%if 0%{?rhel} +# Remove the upstream virtio-win / spice-guest-tools drivers +find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} + +%endif %files %dir %{_datadir}/osinfo/ @@ -33,6 +37,10 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0} %{_datadir}/osinfo/schema %changelog +* Mon Feb 15 2021 Fabiano FidĂȘncio - 20210215-1 +- Don't distribute upstream virtio-win drivers on RHEL +- Update to new release (v20210215) + * Tue Feb 02 2021 Fabiano FidĂȘncio - 20210202-1 - Update to new release (v20210202) diff --git a/sources b/sources index 8bab57a..350dafa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (osinfo-db-20210202.tar.xz) = c21d3da4084743e1d4cfb24038edabf147ce9a36f5e2875e63baf16959f5b9270bcac557b96cc556329af9a2a1de5a3c63ea455c5dace557bf6557fb24d0bd95 -SHA512 (osinfo-db-20210202.tar.xz.asc) = ff0a02785eb8bd18fa35ccd6c704614baaa069a15e6cffc701d652e8a4a9ea1d34bf25deff3104cbef3cacfa993e1e880f7d70fe164accbe6f4aa65c50728b91 +SHA512 (osinfo-db-20210215.tar.xz) = 1089c34b17927d17192728f877b73a9ae79247f2d4dd26b106349a6c13e1180248ef9e9f3c54a9dd48fb8fc49d6d6a09ccf0e9457c03a1e8d470838dc6c63839 +SHA512 (osinfo-db-20210215.tar.xz.asc) = 8092e9df3efa2ae184b4ca2ec2e26704751414fb5c17b0bf04c4271b1a7ca81088a82b1db0b3dc04eabd4b4681eae2c91ef3408ed91b80ed92ccdc162405542f