From 38167808be9de3febc7bc0b6e1c9d92ca58e35c6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 18 May 2021 03:00:43 -0400
Subject: [PATCH] import osinfo-db-20210215-1.el8

---
 .gitignore                            |  2 +-
 .osinfo-db.metadata                   |  2 +-
 SOURCES/osinfo-db-20200813.tar.xz.asc | 16 -------------
 SOURCES/osinfo-db-20210215.tar.xz.asc | 16 +++++++++++++
 SPECS/osinfo-db.spec                  | 34 ++++++++++-----------------
 5 files changed, 30 insertions(+), 40 deletions(-)
 delete mode 100644 SOURCES/osinfo-db-20200813.tar.xz.asc
 create mode 100644 SOURCES/osinfo-db-20210215.tar.xz.asc

diff --git a/.gitignore b/.gitignore
index e7a945c..ce73136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20200813.tar.xz
+SOURCES/osinfo-db-20210215.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 8506a0a..5725ba9 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-be3815c0c09ce4009ee8c927cfffc290311cbea9 SOURCES/osinfo-db-20200813.tar.xz
+eb65b68e69b1955167d30ff6c9a213affde78418 SOURCES/osinfo-db-20210215.tar.xz
diff --git a/SOURCES/osinfo-db-20200813.tar.xz.asc b/SOURCES/osinfo-db-20200813.tar.xz.asc
deleted file mode 100644
index d61bb97..0000000
--- a/SOURCES/osinfo-db-20200813.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAl81HC8ACgkQ7pJsK9rM
-F3sWbA/+I/97erNbPNyn1cSvykx9yWrntgB0/tGBoNjAOVTroxIER4phe5g8zbwv
-KkIl/ez9nhJ55LfG9q84WnNJNRJdPOPTjauwzOGk/WNFu6Xry5WZ/Kt7JVf0UAu4
-FIx2LpGCgB5IExsgVtQJuzgVO78UDvyW9jvCP/IqIiXbg30CbktTXCD2LR0wLf6v
-0APvZWGFu1WjkFYuo9n3FL2WKMH/Bq2Y7fZwj7fXZWx2wDrjCcUvzusTxlk9yGvR
-HeVuSdc/REUyWvMZGE43Z0TTXkOkIlFq/YSb7YZhohBX6XZQy0OhWsuaiLxdo9Wl
-Pb+oudvmrkpQ50iJR4Ni7ttKOOF9mypH29iLC+tLpkw9uSppifJoxVOUFQ/q0Pyl
-0iuaT0PFrMo2bLXFKPdLMtQJ6yxaHNFp0Vn27l2R3pdzeWW8+0Y2Xu7fdpP1/2ej
-4ZgGg6JgUDPfsXEcsclr5WTtDxPTx6G4qmVnBd4KIO8InGuWebJZJB3qFlf3rg0M
-uN9M1w+0fFRP81S9XNm8JkBaoXXICL+U0ZZodXjgSAAn2DAmCt5K4VQdBePX3uim
-b1Fcw3SjtgX4TMLc6FfGIuY/Rw4ofdkBfGoDnAZ9szpOuGMFHKGvFYg5WqV1Z8L6
-RMsiqjVT3MP9dal8+zQ5o+S38LqC97Ximw84k3lyDT31AQL5sWg=
-=kyQ4
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20210215.tar.xz.asc b/SOURCES/osinfo-db-20210215.tar.xz.asc
new file mode 100644
index 0000000..8cd645d
--- /dev/null
+++ b/SOURCES/osinfo-db-20210215.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAmAqUSwACgkQ7pJsK9rM
+F3v2DBAAxIotcbyCjulyMUnCFnqwH8M6ogKA44OygwndimIRDfvZBcscRNR4DuMJ
+kf6x0L6uWwGfOtORaYtZ40wtrPWp/UoYdM134SlyETa70lp4f2mO1CBWVO4j4i7d
+Iw7p2ZqYWF4l8n7LiLzVUWyBVTi4e5NyJT6Y4UTmDjB/0luW6M9w3SKEmHIeTKDn
+CqW9kXoOOTX9fxybsxnRZzxMZaPR4NIybUB8I+XAzDLjPfsGXuQzlUKtjstPqF9O
+2HSNB17RNLubO9UOa7oEq5NWsLJ/q/oHTaWgGfvqCQJQjK3UtmP+Zz5DZYqSFi/1
+X+xr8j1Pe+QNTYMmUFyCXIcXGAMffLbAB4YGxDOum4Yy355paa+rM4RgQSo6ZgAv
+ESCo4opAGamh5bzruNLzDX9fKSLezo/NQ3r2voJkld4xKx1CC+mws/cZWuFewSrz
+vy2KVv20R2J2eUUMvgNCAOun8GFwwd3a/Pem6KnXfjn3CsJIH4xnq11KI13RKBz/
+96grCUwmw9Tq2CQRsu7DEVuG+RsoOXIOiY1Y9Ktj1M7tDkSfvIRqhV7CIQmVh68L
+8grURI97zOXMinlAUt9+gB3cwia1HseqtFqNkk6hLs53y1mo7Huothzt6S67ZnZI
+w8dpmDFuOWm6H1PBojvvs5tVJvyc0dGOASsMWZHZQK8oyvEMzaI=
+=AFN6
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index fb7fd3b..d26dd88 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -1,16 +1,13 @@
 # -*- rpm-spec -*-
 
-%define PatchedSource ../%{name}-%{version}-patched.tar.xz
-
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20200813
+Version: 20210215
 Release: 1%{?dist}
 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
 URL: http://libosinfo.org/
-
 BuildRequires: intltool
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
@@ -21,25 +18,12 @@ The osinfo database provides information about operating systems and
 hypervisor platforms to facilitate the automated configuration and
 provisioning of new virtual machines
 
-%prep
-%setup
-
-# Remove spurious leftovers from when applying the patches
-find ../%{name}-%{version}/ -name "*.orig" -exec rm -f {} \;
-
-# Remove the upstream virtio-win / spice-guest-tools drivers
-find ../%{name}-%{version}/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
-
-# For us to be able to apply patches on top of a rebase, we:
-# 1. unpack the sources
-# 2. patch the sources
-# 3. pack the sources in a tarball
-# 4. feed the patched tarball to osinfo-db-import
-%build
-tar -cvJf %{PatchedSource} ../%{name}-%{version}/
-
 %install
-osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
+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/
@@ -53,6 +37,12 @@ osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 %{_datadir}/osinfo/schema
 
 %changelog
+* Mon Feb 15 2021 Fabiano Fidêncio <fidencio@redhat.com> - 20210215-1
+- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
+
+* Thu Feb 04 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 20201218-3
+- Resolves: rhbz#1903300 - rebase osinfo-db to latest fedora
+
 * Thu Aug 13 2020 Fabiano Fidêncio <fidencio@redhat.com> - 20200813-1
 - Update to v20200813 release
 - Related: rhbz#1837756 - osinfo-db is out of date