From 5db7dc08793e9e83be0eac44482cc3dcaf760031 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 29 2019 15:24:35 +0000
Subject: import osinfo-db-20181214-1.el7_6


---

diff --git a/.gitignore b/.gitignore
index 43be971..18b5a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20180531.tar.xz
+SOURCES/osinfo-db-20181214.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 7c8d9ec..7f7eee7 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-9a4441d6535e7ebc8c85dd9aadda7aec883c2f5e SOURCES/osinfo-db-20180531.tar.xz
+e9b9046a7efcb3700449a7f24ee47ae0b82225ba SOURCES/osinfo-db-20181214.tar.xz
diff --git a/SOURCES/add-rhel7.6-data.patch b/SOURCES/add-rhel7.6-data.patch
deleted file mode 100644
index 7c5ba8d..0000000
--- a/SOURCES/add-rhel7.6-data.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From f7ef5a8616c21d57926498c240a6f7d307b529a8 Mon Sep 17 00:00:00 2001
-From: Felipe Borges <feborges@redhat.com>
-Date: Mon, 11 Jun 2018 12:42:04 +0200
-Subject: [PATCH] rhel: Add Red Hat Enterprise Linux 7.6
-
----
- os/redhat.com/rhel-7.6.xml | 96 +++++++++++++++++++++++++++++++++
- 1 file changed, 96 insertions(+)
- create mode 100644 os/redhat.com/rhel-7.6.xml
-
-diff --git a/os/redhat.com/rhel-7.6.xml b/os/redhat.com/rhel-7.6.xml
-new file mode 100644
-index 0000000..84cf718
---- /dev/null
-+++ b/os/redhat.com/rhel-7.6.xml
-@@ -0,0 +1,96 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="http://redhat.com/rhel/7.6">
-+    <short-id>rhel7.6</short-id>
-+    <name>Red Hat Enterprise Linux 7.6</name>
-+    <version>7.6</version>
-+    <vendor>Red Hat, Inc</vendor>
-+    <vendor xml:lang="ca">Red Hat, Inc</vendor>
-+    <vendor xml:lang="de">Red Hat, Inc</vendor>
-+    <vendor xml:lang="es">Red Hat, Inc</vendor>
-+    <vendor xml:lang="fr">Red Hat, Inc</vendor>
-+    <vendor xml:lang="id">Red Hat, Inc</vendor>
-+    <vendor xml:lang="ja">Red Hat, Inc</vendor>
-+    <vendor xml:lang="pl">Red Hat, Inc</vendor>
-+    <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
-+    <vendor xml:lang="uk">Red Hat, Inc</vendor>
-+    <family>linux</family>
-+    <distro>rhel</distro>
-+    <codename>Maipo</codename>
-+    <upgrades id="http://redhat.com/rhel/7.5"/>
-+    <derives-from id="http://redhat.com/rhel/7.5"/>
-+
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL-7.6.*x86_64.*</volume-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <media arch="aarch64">
-+       <iso>
-+         <system-id>LINUX</system-id>
-+         <volume-id>RHEL-7.6.*aarch64$</volume-id>
-+       </iso>
-+     </media>
-+
-+    <media arch="ppc64">
-+       <iso>
-+         <system-id>PPC</system-id>
-+         <volume-id>RHEL-7.6.*ppc64$</volume-id>
-+       </iso>
-+     </media>
-+
-+    <media arch="ppc64le">
-+       <iso>
-+         <system-id>PPC</system-id>
-+         <volume-id>RHEL-7.6.*ppc64le$</volume-id>
-+       </iso>
-+     </media>
-+
-+    <media arch="s390x">
-+       <iso>
-+         <system-id>LINUX</system-id>
-+         <volume-id>RHEL-7.6.*s390x$</volume-id>
-+       </iso>
-+     </media>
-+
-+    <resources arch="ppc64">
-+      <minimum>
-+        <n-cpus>1</n-cpus>
-+        <cpu>1000000000</cpu>
-+        <ram>2147483648</ram>
-+        <storage>10737418240</storage>
-+      </minimum>
-+
-+      <recommended>
-+        <cpu>400000000</cpu>
-+        <ram>2147483648</ram>
-+        <storage>21474836480</storage>
-+      </recommended>
-+    </resources>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <n-cpus>1</n-cpus>
-+        <cpu>1000000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>10737418240</storage>
-+      </minimum>
-+
-+      <recommended>
-+        <cpu>1000000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>10737418240</storage>
-+      </recommended>
-+    </resources>
-+
-+    <installer>
-+      <script id='http://redhat.com/rhel/kickstart/jeos'/>
-+      <script id='http://redhat.com/rhel/kickstart/desktop'/>
-+    </installer>
-+  </os>
-+</libosinfo>
--- 
-2.17.1
-
diff --git a/SOURCES/osinfo-db-20180531.tar.xz.asc b/SOURCES/osinfo-db-20180531.tar.xz.asc
deleted file mode 100644
index d2147f8..0000000
--- a/SOURCES/osinfo-db-20180531.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEGy6B0w1CsqINNP4WYABGudZGtF0FAlsQUjsACgkQYABGudZG
-tF2juggApJ38EZQNsGwPbT2xngDBVhnAQHD9RdTe+uEaVAbWnSrimzjhZV4MpYy3
-vF0X56N8d6tQZgVFqV8GF7K5CxVmD2c/aodS2M7M4NRpKN5ivAWLl3q+ULE5vOz8
-1Ru7blBTETCc5axEQ/nUNC1ETCbdH/4Ch+dTSK2eUDbM0w/9RSNzbdmJPxCtZW9u
-zzcxfudKWrNP8q0Pdn7dgDrZasO+9adM1S2CMyDfYER+KUo+M6Z2BuIxDVIgTtwU
-lrHkNuAPuui+58/H5LqF3mEzOcl4Kb64+KVjUvjyCVnMWmSGzAYtT1EBdrUkAYaA
-nUCFv/ST0gvQPKOowewHUhoT3WKJ2A==
-=QiUU
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20181214.tar.xz.asc b/SOURCES/osinfo-db-20181214.tar.xz.asc
new file mode 100644
index 0000000..6de82cb
--- /dev/null
+++ b/SOURCES/osinfo-db-20181214.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJcE+NMAAoJEO6SbCvazBd7tXkP/jlPC1fbIajCAtxxSWy0EaOK
+wgEhJEe9prixyR65V8ONwNMgnEW/smHOtFzRc/jhRuzfsfA1ftZjrrjxR44riHbV
+ID7B3X9Dqz3MsNDedP5+mIIr62PZCidMiBx/cq+X7StRZunhrYC8EWzVYZsL7vNd
+IkJe8cVOYOCBsImCE9u3QamsRae+Q4f+nM6+k5BmDVBQDhnR/O0ASkQVMVfwMiZL
+p/b/Zuu/7x7PXoqxroZUNPKPx/TmB6V4Pq1UN+3yksf7cJB8KkKgPCKSGrc+JFiL
+w/x1Mn5HJ+lXDodpmITn3+BeEkWQZCew2nZyyy06d0sD1dMutQKIUg20OdhvBmUh
+WO4IPos2/Bf7ud+7hDM1F3GFZwZrziih3PzLV72VIM7ME9HnwRltCHO/t27HZwjX
+Qh89O1egEvQa+RyOlnSw4Qcbgn8gdbJL1DzP6Zl+ebGgTeMKVPvqqf8fyV6IcijP
+hL7hhHUDMcKCSR35ibJKVgrvrqn8k7be4sRWjiV67TVMUqotQ0rkLKXPwQ5LEVq0
+vNICQS4Y7TEkgodE3Lf7kwfsQZfvIRfbnW7mQcUb7b9o7eAKk30ggBbeB6G5yJNM
+JGACQi+yfjvTjO1vYbRhV8XZPbjqF2BnjuXPp6VQvh0/3vNHWRapsImB8W4mRj+S
+aMCbMzHfR82iTrRVagS/
+=MjdY
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index 99b0648..ee0166e 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -4,7 +4,7 @@
 
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20180531
+Version: 20181214
 Release: 1%{?dist}
 License: LGPLv2+
 Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
@@ -15,8 +15,6 @@ BuildRequires: osinfo-db-tools
 BuildArch: noarch
 Requires: hwdata
 
-Patch0: add-rhel7.6-data.patch
-
 %description
 The osinfo database provides information about operating systems and
 hypervisor platforms to facilitate the automated configuration and
@@ -24,7 +22,6 @@ provisioning of new virtual machines
 
 %prep
 %setup -q
-%patch0 -p1 -b .add-rhel7.6-data
 
 # For us to be able to apply patches on top of a rebase,
 # we:
@@ -50,6 +47,12 @@ osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 %{_datadir}/osinfo/schema
 
 %changelog
+* Thu Dec 14 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181214-1
+- Resolves: rhbz#1652088 - Rebase to the latest upstream release
+
+* Thu Dec 06 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181203-1
+- Resolves: rhbz#1652088 - Rebase to the latest upstream release
+
 * Mon Jun 11 2018 Felipe Borges <feborges@redhat.com> - 20180531-1
 - Rebase to 20180531
 - Add RHEL 7.6