From 6787c12d6e77410b4d1009d5770956515ff0239f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 5 Nov 2019 14:02:38 -0500
Subject: [PATCH] import osinfo-db-20190611-1.el8

---
 .gitignore                                    |   2 +-
 .osinfo-db.metadata                           |   2 +-
 .../0001-rhel-Add-rhel-7.6-media-info.patch   | 121 --------
 SOURCES/0001-rhel-Add-rhel-8.1.patch          | 240 ++++++++++++++++
 SOURCES/0002-rhel-Add-rhel-7.7.patch          | 259 ++++++++++++++++++
 SOURCES/0002-rhel-Add-rhel-8-media-info.patch | 100 -------
 ...l-script-Add-JeOS-support-for-rhel-8.patch |  67 -----
 ...cript-Add-Desktop-support-for-rhel-8.patch | 106 -------
 ...sting-upgrades-derives-from-debian-9.patch |  38 ---
 SOURCES/0006-fedora-Update-f29-data.patch     | 121 --------
 ...-silverblue-Update-silverblue29-data.patch |  34 ---
 ...buntu18.10-Update-data-after-release.patch |  86 ------
 ...rblue-Adjust-ostree-ref-name-for-f29.patch |  44 ---
 ...8.0-Update-entry-to-also-match-8.0.x.patch | 154 -----------
 SOURCES/0011-win-Add-win-2k19-entry.patch     |  65 -----
 SOURCES/osinfo-db-20181011.tar.xz.asc         |  17 --
 SOURCES/osinfo-db-20190611.tar.xz.asc         |  16 ++
 SPECS/osinfo-db.spec                          |  42 +--
 18 files changed, 540 insertions(+), 974 deletions(-)
 delete mode 100644 SOURCES/0001-rhel-Add-rhel-7.6-media-info.patch
 create mode 100644 SOURCES/0001-rhel-Add-rhel-8.1.patch
 create mode 100644 SOURCES/0002-rhel-Add-rhel-7.7.patch
 delete mode 100644 SOURCES/0002-rhel-Add-rhel-8-media-info.patch
 delete mode 100644 SOURCES/0003-install-script-Add-JeOS-support-for-rhel-8.patch
 delete mode 100644 SOURCES/0004-install-script-Add-Desktop-support-for-rhel-8.patch
 delete mode 100644 SOURCES/0005-debian-testing-upgrades-derives-from-debian-9.patch
 delete mode 100644 SOURCES/0006-fedora-Update-f29-data.patch
 delete mode 100644 SOURCES/0007-silverblue-Update-silverblue29-data.patch
 delete mode 100644 SOURCES/0008-ubuntu18.10-Update-data-after-release.patch
 delete mode 100644 SOURCES/0009-silverblue-Adjust-ostree-ref-name-for-f29.patch
 delete mode 100644 SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch
 delete mode 100644 SOURCES/0011-win-Add-win-2k19-entry.patch
 delete mode 100644 SOURCES/osinfo-db-20181011.tar.xz.asc
 create mode 100644 SOURCES/osinfo-db-20190611.tar.xz.asc

diff --git a/.gitignore b/.gitignore
index 2427742..8135c92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osinfo-db-20181011.tar.xz
+SOURCES/osinfo-db-20190611.tar.xz
diff --git a/.osinfo-db.metadata b/.osinfo-db.metadata
index 1bbb1d3..d64b889 100644
--- a/.osinfo-db.metadata
+++ b/.osinfo-db.metadata
@@ -1 +1 @@
-ce73c86bb5770c0be3fbdcd9e7c97945e0962be5 SOURCES/osinfo-db-20181011.tar.xz
+abce45f689a58ea209afa3cf632fc67a7b2373b3 SOURCES/osinfo-db-20190611.tar.xz
diff --git a/SOURCES/0001-rhel-Add-rhel-7.6-media-info.patch b/SOURCES/0001-rhel-Add-rhel-7.6-media-info.patch
deleted file mode 100644
index 8d18814..0000000
--- a/SOURCES/0001-rhel-Add-rhel-7.6-media-info.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 9cf5a8c3b30c9c3e547157b10cce8c4a4ebe15f6 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 rhel-7.6 media info
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1580232
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- os/redhat.com/rhel-7.6.xml | 96 ++++++++++++++++++++++++++++++
- 1 file changed, 96 insertions(+)
- create mode 100644 data/os/redhat.com/rhel-7.6.xml.in
-
-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>4000000000</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/0001-rhel-Add-rhel-8.1.patch b/SOURCES/0001-rhel-Add-rhel-8.1.patch
new file mode 100644
index 0000000..26cbed2
--- /dev/null
+++ b/SOURCES/0001-rhel-Add-rhel-8.1.patch
@@ -0,0 +1,240 @@
+From cfb289f3c78bee9dd7bc0fcf96dca46187ef3f68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Thu, 23 May 2019 10:36:53 +0200
+Subject: [PATCH 1/2] rhel: Add rhel-8.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+---
+ os/redhat.com/rhel-8-unknown.xml |  22 +++---
+ os/redhat.com/rhel-8.1.xml       | 127 +++++++++++++++++++++++++++++++
+ 2 files changed, 139 insertions(+), 12 deletions(-)
+ create mode 100644 os/redhat.com/rhel-8.1.xml
+
+diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
+index 226a018..fcf601d 100644
+--- a/os/redhat.com/rhel-8-unknown.xml
++++ b/os/redhat.com/rhel-8-unknown.xml
+@@ -18,14 +18,14 @@
+     <vendor xml:lang="uk">Red Hat, Inc</vendor>
+     <family>linux</family>
+     <distro>rhel</distro>
+     <codename>Ootpa</codename>
+-    <upgrades id="http://redhat.com/rhel/8.0"/>
+-    <derives-from id="http://redhat.com/rhel/8.0"/>
++    <upgrades id="http://redhat.com/rhel/8.1"/>
++    <derives-from id="http://redhat.com/rhel/8.1"/>
+ 
+     <media arch="x86_64">
+       <iso>
+         <system-id>LINUX</system-id>
+-        <volume-id>.*RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
++        <volume-id>.*RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+       </iso>
+       <kernel>isolinux/vmlinuz</kernel>
+       <initrd>isolinux/initrd.img</initrd>
+@@ -34,28 +34,28 @@
+     <media arch="aarch64">
+        <iso>
+          <system-id>LINUX</system-id>
+-         <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
++         <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+        </iso>
+      </media>
+ 
+     <media arch="ppc64le">
+        <iso>
+          <system-id>PPC</system-id>
+-         <volume-id>RHEL[_-]8[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
++         <volume-id>RHEL[_-]8[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+        </iso>
+      </media>
+ 
+     <media arch="s390x">
+        <iso>
+          <system-id>LINUX</system-id>
+-         <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
++         <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+        </iso>
+      </media>
+ 
+     <tree arch="aarch64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
++        <version>^8.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+         <arch>aarch64</arch>
+       </treeinfo>
+     </tree>
+@@ -63,7 +63,7 @@
+     <tree arch="ppc64le">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>ppc64le</arch>
+       </treeinfo>
+     </tree>
+@@ -71,7 +71,7 @@
+     <tree arch="s390x">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>s390x</arch>
+       </treeinfo>
+     </tree>
+@@ -79,7 +79,7 @@
+     <tree arch="x86_64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
++        <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+         <arch>x86_64</arch>
+       </treeinfo>
+     </tree>
+@@ -114,4 +114,4 @@
+       </recommended>
+     </resources>
+   </os>
+-</libosinfo>
+\ No newline at end of file
++</libosinfo>
+diff --git a/os/redhat.com/rhel-8.1.xml b/os/redhat.com/rhel-8.1.xml
+new file mode 100644
+index 0000000..1022cca
+--- /dev/null
++++ b/os/redhat.com/rhel-8.1.xml
+@@ -0,0 +1,127 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++  <os id="http://redhat.com/rhel/8.1">
++    <short-id>rhel8.1</short-id>
++    <name>Red Hat Enterprise Linux 8.1</name>
++    <version>8.1</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="it">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>Ootpa</codename>
++    <upgrades id="http://redhat.com/rhel/8.0"/>
++    <derives-from id="http://redhat.com/rhel/8.0"/>
++
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <media arch="ppc64le">
++      <iso>
++        <system-id>PPC</system-id>
++        <volume-id>RHEL[_-]8[_-]1[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
++      </iso>
++      <kernel>ppc/ppc64/vmlinuz</kernel>
++      <initrd>ppc/ppc64/initrd.img</initrd>
++    </media>
++
++    <media arch="aarch64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
++      </iso>
++    </media>
++
++    <media arch="s390x">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL-8-1-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
++      </iso>
++    </media>
++
++    <tree arch="aarch64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>aarch64</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="ppc64le">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>ppc64le</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="s390x">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>s390x</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="x86_64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>x86_64</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="aarch64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^8.1(.([0-9]|[1-9][0-9]))?$</version>
++        <arch>aarch64</arch>
++      </treeinfo>
++    </tree>
++
++    <resources arch="ppc64">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>2147483648</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>4000000000</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>
++  </os>
++</libosinfo>
+-- 
+2.21.0
+
diff --git a/SOURCES/0002-rhel-Add-rhel-7.7.patch b/SOURCES/0002-rhel-Add-rhel-7.7.patch
new file mode 100644
index 0000000..3939bec
--- /dev/null
+++ b/SOURCES/0002-rhel-Add-rhel-7.7.patch
@@ -0,0 +1,259 @@
+From ffcda8a251b7dd6dec51359f403da0757c2a857c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Thu, 23 May 2019 10:41:22 +0200
+Subject: [PATCH 2/2] rhel: Add rhel-7.7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+---
+ os/redhat.com/rhel-7-unknown.xml |  24 +++---
+ os/redhat.com/rhel-7.7.xml       | 139 +++++++++++++++++++++++++++++++
+ 2 files changed, 151 insertions(+), 12 deletions(-)
+ create mode 100644 os/redhat.com/rhel-7.7.xml
+
+diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml
+index 1477a1a..7256b09 100644
+--- a/os/redhat.com/rhel-7-unknown.xml
++++ b/os/redhat.com/rhel-7-unknown.xml
+@@ -19,13 +19,13 @@
+     <family>linux</family>
+     <distro>rhel</distro>
+     <codename>Maipo</codename>
+-    <upgrades id="http://redhat.com/rhel/7.6"/>
+-    <derives-from id="http://redhat.com/rhel/7.6"/>
++    <upgrades id="http://redhat.com/rhel/7.7"/>
++    <derives-from id="http://redhat.com/rhel/7.7"/>
+ 
+     <media arch="x86_64">
+       <iso>
+         <system-id>LINUX</system-id>
+-        <volume-id>.*RHEL-7.([7-9]|[1-9][0-9]).*x86_64.*</volume-id>
++        <volume-id>.*RHEL-7.([8-9]|[1-9][0-9]).*x86_64.*</volume-id>
+       </iso>
+       <kernel>isolinux/vmlinuz</kernel>
+       <initrd>isolinux/initrd.img</initrd>
+@@ -34,35 +34,35 @@
+     <media arch="aarch64">
+        <iso>
+          <system-id>LINUX</system-id>
+-         <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*aarch64$</volume-id>
++         <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*aarch64$</volume-id>
+        </iso>
+      </media>
+ 
+     <media arch="ppc64">
+        <iso>
+          <system-id>PPC</system-id>
+-         <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64$</volume-id>
++         <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64$</volume-id>
+        </iso>
+      </media>
+ 
+     <media arch="ppc64le">
+        <iso>
+          <system-id>PPC</system-id>
+-         <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64le$</volume-id>
++         <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64le$</volume-id>
+        </iso>
+      </media>
+ 
+     <media arch="s390x">
+        <iso>
+          <system-id>LINUX</system-id>
+-         <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*s390x$</volume-id>
++         <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*s390x$</volume-id>
+        </iso>
+      </media>
+ 
+     <tree arch="ppc64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^7.([7-9]|[1-9][0-9])$</version>
++        <version>^7.([8-9]|[1-9][0-9])$</version>
+         <arch>ppc64</arch>
+       </treeinfo>
+     </tree>
+@@ -70,7 +70,7 @@
+     <tree arch="ppc64le">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^7.([7-9]|[1-9][0-9])$</version>
++        <version>^7.([8-9]|[1-9][0-9])$</version>
+         <arch>ppc64le</arch>
+       </treeinfo>
+     </tree>
+@@ -78,7 +78,7 @@
+     <tree arch="s390x">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^7.([7-9]|[1-9][0-9])$</version>
++        <version>^7.([8-9]|[1-9][0-9])$</version>
+         <arch>s390x</arch>
+       </treeinfo>
+     </tree>
+@@ -86,7 +86,7 @@
+     <tree arch="x86_64">
+       <treeinfo>
+         <family>Red Hat Enterprise Linux</family>
+-        <version>^7.([7-9]|[1-9][0-9])$</version>
++        <version>^7.([8-9]|[1-9][0-9])$</version>
+         <arch>x86_64</arch>
+       </treeinfo>
+     </tree>
+@@ -134,4 +134,4 @@
+       <script id='http://redhat.com/rhel/kickstart/desktop'/>
+     </installer>
+   </os>
+-</libosinfo>
+\ No newline at end of file
++</libosinfo>
+diff --git a/os/redhat.com/rhel-7.7.xml b/os/redhat.com/rhel-7.7.xml
+new file mode 100644
+index 0000000..c140542
+--- /dev/null
++++ b/os/redhat.com/rhel-7.7.xml
+@@ -0,0 +1,139 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++  <os id="http://redhat.com/rhel/7.7">
++    <short-id>rhel7.7</short-id>
++    <name>Red Hat Enterprise Linux 7.7</name>
++    <version>7.7</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="it">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.6"/>
++    <derives-from id="http://redhat.com/rhel/7.6"/>
++
++    <release-date>2018-10-30</release-date>
++
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.7.*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.7.*aarch64$</volume-id>
++       </iso>
++     </media>
++
++    <media arch="ppc64">
++       <iso>
++         <system-id>PPC</system-id>
++         <volume-id>RHEL[-_]7.7.*ppc64$</volume-id>
++       </iso>
++     </media>
++
++    <media arch="ppc64le">
++       <iso>
++         <system-id>PPC</system-id>
++         <volume-id>RHEL[-_]7.7.*ppc64le$</volume-id>
++       </iso>
++     </media>
++
++    <media arch="s390x">
++       <iso>
++         <system-id>LINUX</system-id>
++         <volume-id>RHEL-7.7.*s390x$</volume-id>
++       </iso>
++     </media>
++
++    <tree arch="ppc64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^7.7$</version>
++        <arch>ppc64</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="ppc64le">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^7.7$</version>
++        <arch>ppc64le</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="s390x">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^7.7$</version>
++        <arch>s390x</arch>
++      </treeinfo>
++    </tree>
++
++    <tree arch="x86_64">
++      <treeinfo>
++        <family>Red Hat Enterprise Linux</family>
++        <version>^7.7$</version>
++        <arch>x86_64</arch>
++      </treeinfo>
++    </tree>
++
++    <resources arch="ppc64">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>2147483648</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>4000000000</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>
++
++      <maximum>
++        <ram>13194139533312</ram>
++      </maximum>
++
++      <network-install>
++        <ram>1610612736</ram>
++      </network-install>
++    </resources>
++
++    <installer>
++      <script id='http://redhat.com/rhel/kickstart/jeos'/>
++      <script id='http://redhat.com/rhel/kickstart/desktop'/>
++    </installer>
++  </os>
++</libosinfo>
+-- 
+2.21.0
+
diff --git a/SOURCES/0002-rhel-Add-rhel-8-media-info.patch b/SOURCES/0002-rhel-Add-rhel-8-media-info.patch
deleted file mode 100644
index cc472d1..0000000
--- a/SOURCES/0002-rhel-Add-rhel-8-media-info.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From e3a28d9888b59f79d31daad75bf6b864f03060f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Mon, 10 Sep 2018 10:36:29 +0200
-Subject: [PATCH] rhel: Add rhel-8 media info
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1580232
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- os/redhat.com/rhel-8.0.xml | 75 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 75 insertions(+)
- create mode 100644 os/redhat.com/rhel-8.0.xml
-
-diff --git a/os/redhat.com/rhel-8.0.xml b/os/redhat.com/rhel-8.0.xml
-new file mode 100644
-index 0000000..2bea47d
---- /dev/null
-+++ b/os/redhat.com/rhel-8.0.xml
-@@ -0,0 +1,75 @@
-+<libosinfo version="0.0.1">
-+<!-- Licensed under the GNU General Public License version 2 or later.
-+     See http://www.gnu.org/licenses/ for a copy of the license text -->
-+  <os id="http://redhat.com/rhel/8.0">
-+    <short-id>rhel8.0</short-id>
-+    <name>Red Hat Enterprise Linux 8.0</name>
-+    <version>8.0</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>
-+    <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-8-0-BaseOS-x86_64</volume-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <media arch="ppc64le">
-+      <iso>
-+        <system-id>PPC</system-id>
-+        <volume-id>RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le</volume-id>
-+      </iso>
-+      <kernel>ppc/ppc64/vmlinuz</kernel>
-+      <initrd>ppc/ppc64/initrd.img</initrd>
-+    </media>
-+
-+    <media arch="aarch64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>RHEL-8-0-BaseOS-aarch64</volume-id>
-+      </iso>
-+    </media>
-+
-+    <media arch="s390x">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>RHEL-8-0-BaseOS-s390x</volume-id>
-+      </iso>
-+    </media>
-+
-+    <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.19.1
-
diff --git a/SOURCES/0003-install-script-Add-JeOS-support-for-rhel-8.patch b/SOURCES/0003-install-script-Add-JeOS-support-for-rhel-8.patch
deleted file mode 100644
index 3ddd70e..0000000
--- a/SOURCES/0003-install-script-Add-JeOS-support-for-rhel-8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From aca3fd59e0f53fec06e84c04e6052a2777ed7fb3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Mon, 10 Sep 2018 13:34:31 +0200
-Subject: [PATCH] install-script: Add JeOS support for rhel-8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1580232
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- .../redhat.com/rhel-kickstart-jeos.xml     | 24 +++++++++++++++----
- 1 file changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/install-script/redhat.com/rhel-kickstart-jeos.xml b/install-script/redhat.com/rhel-kickstart-jeos.xml
-index db7ec7f..9171389 100644
---- a/install-script/redhat.com/rhel-kickstart-jeos.xml
-+++ b/install-script/redhat.com/rhel-kickstart-jeos.xml
-@@ -65,7 +65,14 @@ skipx
- network --bootproto dhcp
- rootpw <xsl:value-of select="config/admin-password"/>
- firewall --disabled
-+<xsl:choose>
-+  <xsl:when test="os/version &lt; 8">
- authconfig --enableshadow --enablemd5
-+  </xsl:when>
-+  <xsl:otherwise>
-+authselect select sssd
-+  </xsl:otherwise>
-+</xsl:choose>
- selinux --enforcing
- timezone --utc <xsl:value-of select="config/l10n-timezone"/>
- bootloader --location=mbr
-@@ -75,17 +82,24 @@ clearpart --all --drives=<xsl:call-template name="target-disk"/>
- 
- 
- <xsl:choose>
--  <xsl:when test="os/version &lt; 7">
-+  <xsl:when test="os/version &lt; 8">
-+    <xsl:choose>
-+      <xsl:when test="os/version &lt; 7">
- part /boot --fstype ext4 --size=1024 --ondisk=<xsl:call-template name="target-disk"/>
--  </xsl:when>
--  <xsl:otherwise>
-+      </xsl:when>
-+      <xsl:otherwise>
- part /boot --fstype ext4 --recommended --ondisk=<xsl:call-template name="target-disk"/>
--  </xsl:otherwise>
--</xsl:choose>
-+      </xsl:otherwise>
-+    </xsl:choose>
- part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
- volgroup VolGroup00 --pesize=32768 pv.2
- logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
- logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
-+  </xsl:when>
-+  <xsl:otherwise>
-+autopart --type=lvm
-+  </xsl:otherwise>
-+</xsl:choose>
- reboot
- 
- %packages
--- 
-2.17.1
-
diff --git a/SOURCES/0004-install-script-Add-Desktop-support-for-rhel-8.patch b/SOURCES/0004-install-script-Add-Desktop-support-for-rhel-8.patch
deleted file mode 100644
index bdb4e8a..0000000
--- a/SOURCES/0004-install-script-Add-Desktop-support-for-rhel-8.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 1b2ffd45836aefa7a06cf5f0b62dc8b65df8e4ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Mon, 10 Sep 2018 13:16:36 +0200
-Subject: [PATCH] install-script: Add Desktop support for rhel-8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The kickstart installation has only been working, so far, for the
-"unified" ISO as the content needed to install a "workstation" is not
-present in the default "DVD" install.
-
-There's still a lot of conversations to happen and things to figure out
-before we can consider this patch "official". But, at least for, it's
-good as it is for testing the "unified" ISO.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1580232
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- .../redhat.com/rhel-kickstart-desktop.xml  | 43 ++++++++++++++-----
- 1 file changed, 32 insertions(+), 11 deletions(-)
-
-diff --git a/install-script/redhat.com/rhel-kickstart-desktop.xml b/install-script/redhat.com/rhel-kickstart-desktop.xml
-index 388d6d7..14ba866 100644
---- a/install-script/redhat.com/rhel-kickstart-desktop.xml
-+++ b/install-script/redhat.com/rhel-kickstart-desktop.xml
-@@ -69,7 +69,14 @@ lang <xsl:value-of select="config/l10n-language"/>
- network --onboot yes --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/>
- rootpw dummyPa55w0rd # Actual password set (or unset) in %post below
- firewall --disabled
-+<xsl:choose>
-+  <xsl:when test="os/version &lt; 8">
- authconfig --enableshadow --enablemd5
-+  </xsl:when>
-+  <xsl:otherwise>
-+authselect select sssd
-+  </xsl:otherwise>
-+</xsl:choose>
- timezone --utc <xsl:value-of select="config/l10n-timezone"/>
- bootloader --location=mbr
- zerombr
-@@ -79,35 +86,49 @@ clearpart --all --drives=<xsl:call-template name="target-disk"/>
- firstboot --disable
- 
- <xsl:choose>
--  <xsl:when test="os/version &lt; 7">
-+  <xsl:when test="os/version &lt; 8">
-+    <xsl:choose>
-+      <xsl:when test="os/version &lt; 7">
- part /boot --fstype ext4 --size=1024 --ondisk=<xsl:call-template name="target-disk"/>
--  </xsl:when>
--  <xsl:otherwise>
-+      </xsl:when>
-+      <xsl:otherwise>
- part /boot --fstype ext4 --recommended --ondisk=<xsl:call-template name="target-disk"/>
--  </xsl:otherwise>
--</xsl:choose>
-+      </xsl:otherwise>
-+    </xsl:choose>
- part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
- volgroup VolGroup00 --pesize=32768 pv.2
- logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
- logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
-+  </xsl:when>
-+  <xsl:otherwise>
-+autopart --type=lvm
-+  </xsl:otherwise>
-+</xsl:choose>
- reboot
- 
- %packages
-+<xsl:choose>
-+  <xsl:when test="os/version &lt; 8">
- @core
- @x11
--<xsl:choose>
--  <xsl:when test="os/version &lt; 7">
-+    <xsl:choose>
-+      <xsl:when test="os/version &lt; 7">
- @basic-desktop
- @general-desktop
- @desktop-platform
--  </xsl:when>
--  <xsl:otherwise>
-+      </xsl:when>
-+      <xsl:otherwise>
- @gnome-desktop
- @multimedia
--  </xsl:otherwise>
--</xsl:choose>
-+      </xsl:otherwise>
-+    </xsl:choose>
- @internet-browser
- @input-methods
-+  </xsl:when>
-+  <xsl:otherwise>
-+@^workstation-product-environment
-+  </xsl:otherwise>
-+</xsl:choose>
- 
- qemu-guest-agent
- 
--- 
-2.17.1
-
diff --git a/SOURCES/0005-debian-testing-upgrades-derives-from-debian-9.patch b/SOURCES/0005-debian-testing-upgrades-derives-from-debian-9.patch
deleted file mode 100644
index ba26b05..0000000
--- a/SOURCES/0005-debian-testing-upgrades-derives-from-debian-9.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 468eec7237113ef11bc9229ad7603ba0c20090d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Thu, 18 Oct 2018 08:13:22 +0200
-Subject: [PATCH] debian-testing: upgrades/derives-from debian-9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Testing will always upgrade/derive-from the latest debian released. It
-also means that whenever we're adding a new debian version, we'll also
-have to udpdate de upgrades/derives-from here.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1640458
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
----
- os/debian.org/debian-testing.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/os/debian.org/debian-testing.xml b/os/debian.org/debian-testing.xml
-index af209ae..7ed9073 100644
---- a/os/debian.org/debian-testing.xml
-+++ b/os/debian.org/debian-testing.xml
-@@ -8,8 +8,8 @@
-     <_vendor>Debian Project</_vendor>
-     <family>linux</family>
-     <distro>debian</distro>
--    <upgrades id="http://debian.org/debian/8"/>
--    <derives-from id="http://debian.org/debian/8"/>
-+    <upgrades id="http://debian.org/debian/9"/>
-+    <derives-from id="http://debian.org/debian/9"/>
- 
-     <resources arch="all">
-       <minimum>
--- 
-2.19.1
-
diff --git a/SOURCES/0006-fedora-Update-f29-data.patch b/SOURCES/0006-fedora-Update-f29-data.patch
deleted file mode 100644
index eaacba4..0000000
--- a/SOURCES/0006-fedora-Update-f29-data.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 20dc976635354563e3a311b94263f55402b43c18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Thu, 1 Nov 2018 18:31:20 +0100
-Subject: [PATCH] fedora: Update f29 data
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
-Reviewed-by: Felipe Borges <feborges@redhat.com>
----
- os/fedoraproject.org/fedora-29.xml | 35 +++++++++++++++++++++---------
- 1 file changed, 25 insertions(+), 10 deletions(-)
-
-diff --git a/os/fedoraproject.org/fedora-29.xml b/os/fedoraproject.org/fedora-29.xml
-index 149b20f..e8c4e5a 100644
---- a/os/fedoraproject.org/fedora-29.xml
-+++ b/os/fedoraproject.org/fedora-29.xml
-@@ -22,7 +22,7 @@
-     <upgrades id="http://fedoraproject.org/fedora/28"/>
-     <derives-from id="http://fedoraproject.org/fedora/28"/>
- 
--    <release-status>prerelease</release-status>
-+    <release-date>2018-10-30</release-date>
- 
-     <variant id="workstation">
-       <name>Fedora 29 Workstation</name>
-@@ -36,13 +36,16 @@
-     <variant id="server-netinst">
-       <name>Fedora 29 Server</name>
-     </variant>
-+    <variant id="everything-netinst">
-+      <name>Fedora 29 Everything</name>
-+    </variant>
- 
-     
- 
-     
-     <media live="true" arch="x86_64">
-       <variant id="workstation"/>
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-29_Beta-1.5.iso</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-29-1.2.iso</url>
-       <iso>
-         <volume-id>Fedora-WS-Live-29.*</volume-id>
-         <system-id>LINUX</system-id>
-@@ -54,7 +57,7 @@
-     
-     <media arch="x86_64">
-       <variant id="workstation-netinst"/>
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-29_Beta-1.5.iso</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-29-1.2.iso</url>
-       <iso>
-         <volume-id>Fedora-WS-dvd-x86_64-29</volume-id>
-         <system-id>LINUX</system-id>
-@@ -68,11 +71,11 @@
-     
-     <media arch="x86_64">
-       <variant id="server"/>
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Server/x86_64/iso/Fedora-Server-dvd-x86_64-29_Beta-1.5.iso</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Server/x86_64/iso/Fedora-Server-dvd-x86_64-29-1.2.iso</url>
-       <iso>
-         <volume-id>Fedora-S-dvd-x86_64-29</volume-id>
-         <system-id>LINUX</system-id>
--        <volume-size>3001020416</volume-size>
-+        <volume-size>3122104320</volume-size>
-       </iso>
-       <kernel>isolinux/vmlinuz</kernel>
-       <initrd>isolinux/initrd.img</initrd>
-@@ -81,18 +84,30 @@
-     
-     <media arch="x86_64">
-       <variant id="server-netinst"/>
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Server/x86_64/iso/Fedora-Server-netinst-x86_64-29_Beta-1.5.iso</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Server/x86_64/iso/Fedora-Server-netinst-x86_64-29-1.2.iso</url>
-       <iso>
-         <volume-id>Fedora-S-dvd-x86_64-29</volume-id>
-         <system-id>LINUX</system-id>
--        <volume-size>622301184</volume-size>
-+        <volume-size>621264896</volume-size>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <!-- Everything -->
-+    <media arch="x86_64">
-+      <variant id="everything-netinst"/>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-29-1.2.iso</url>
-+      <iso>
-+        <volume-id>Fedora-E-dvd-x86_64-29</volume-id>
-+        <system-id>LINUX</system-id>
-       </iso>
-       <kernel>isolinux/vmlinuz</kernel>
-       <initrd>isolinux/initrd.img</initrd>
-     </media>
- 
-     <tree arch="x86_64">
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Workstation/x86_64/os</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Workstation/x86_64/os</url>
-       <variant id="workstation"/>
-       <treeinfo>
-         <family>Fedora</family>
-@@ -102,7 +117,7 @@
-     </tree>
- 
-     <tree arch="x86_64">
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Server/x86_64/os</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Server/x86_64/os</url>
-       <variant id="server"/>
-       <treeinfo>
-         <family>Fedora</family>
-@@ -132,4 +147,4 @@
-       <script id='http://fedoraproject.org/fedora/kickstart/desktop'/>
-     </installer>
-   </os>
--</libosinfo>
-\ No newline at end of file
-+</libosinfo>
--- 
-2.19.1
-
diff --git a/SOURCES/0007-silverblue-Update-silverblue29-data.patch b/SOURCES/0007-silverblue-Update-silverblue29-data.patch
deleted file mode 100644
index a8a35f1..0000000
--- a/SOURCES/0007-silverblue-Update-silverblue29-data.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 054343c53ebe1995dd2cf50286950889e392a100 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
-Date: Tue, 30 Oct 2018 16:05:07 +0100
-Subject: [PATCH] silverblue: Update silverblue29 data
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
-Reviewed-by: Felipe Borges <feborges@redhat.com>
----
- os/fedoraproject.org/silverblue-29.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/os/fedoraproject.org/silverblue-29.xml b/os/fedoraproject.org/silverblue-29.xml
-index 1fa19c4..369b0b7 100644
---- a/os/fedoraproject.org/silverblue-29.xml
-+++ b/os/fedoraproject.org/silverblue-29.xml
-@@ -11,10 +11,10 @@
-     <upgrades id="http://fedoraproject.org/silverblue/28"/>
-     <derives-from id="http://fedoraproject.org/silverblue/28"/>
- 
--    <release-status>prerelease</release-status>
-+    <release-date>2018-10-30</release-date>
- 
-     <media arch="x86_64">
--      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/test/29_Beta/Silverblue/x86_64/iso/Fedora-Silverblue-ostree-x86_64-29_Beta-1.5.iso</url>
-+      <url>https://download.fedoraproject.org/pub/fedora/linux/releases/29/Silverblue/x86_64/iso/Fedora-Silverblue-ostree-x86_64-29-1.2.iso</url>
-       <iso>
-         <volume-id>Fedora-SB-ostree-x86_64-29</volume-id>
-         <system-id>LINUX</system-id>
--- 
-2.19.1
-
diff --git a/SOURCES/0008-ubuntu18.10-Update-data-after-release.patch b/SOURCES/0008-ubuntu18.10-Update-data-after-release.patch
deleted file mode 100644
index 6cd3810..0000000
--- a/SOURCES/0008-ubuntu18.10-Update-data-after-release.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 39d619de6ccfbda90713783768c2747dfd0c1802 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Fri, 16 Nov 2018 12:24:15 +0100
-Subject: [PATCH] ubuntu18.10: Update data after release
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- os/ubuntu.com/ubuntu-18.10.xml | 23 ++++++++++++++++-------
- 1 file changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/os/ubuntu.com/ubuntu-18.10.xml b/os/ubuntu.com/ubuntu-18.10.xml
-index 59f77e1..041f068 100644
---- a/os/ubuntu.com/ubuntu-18.10.xml
-+++ b/os/ubuntu.com/ubuntu-18.10.xml
-@@ -23,7 +23,6 @@
-     <upgrades id="http://ubuntu.com/ubuntu/18.04"/>
-     <derives-from id="http://ubuntu.com/ubuntu/18.04"/>
- 
--    <release-status>prerelease</release-status>
-     <release-date>2018-10-18</release-date>
-     <eol-date>2019-01-31</eol-date>
- 
-@@ -42,15 +41,25 @@
-     </resources>
- 
-     <media arch="x86_64">
--      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/cosmic-server-amd64.iso</url>
-+      <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-amd64.iso</url>
-       <iso>
-         <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id>
-+        <volume-size>751828992</volume-size>
-       </iso>
-       <kernel>install/vmlinuz</kernel>
-       <initrd>install/initrd.gz</initrd>
-     </media>
-     <media live="true" arch="x86_64">
--      <url>http://cdimage.ubuntu.com/daily-live/current/cosmic-desktop-amd64.iso</url>
-+      <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url>
-+      <iso>
-+        <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id>
-+        <volume-size>923795456</volume-size>
-+      </iso>
-+      <kernel>install/vmlinuz</kernel>
-+      <initrd>install/initrd.gz</initrd>
-+    </media>
-+    <media live="true" arch="x86_64">
-+      <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-desktop-amd64.iso</url>
-       <iso>
-         <volume-id>Ubuntu 18.10(.\d)? amd64</volume-id>
-       </iso>
-@@ -58,19 +67,19 @@
-       <initrd>casper/initrd.lz</initrd>
-     </media>
-     <media arch="aarch64">
--      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/cosmic-server-arm64.iso</url>
-+      <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url>
-       <iso>
-         <volume-id>Ubuntu-Server 18.10(.\d)? arm64</volume-id>
-       </iso>
-     </media>
-     <media arch="ppc64le">
--      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/cosmic-server-ppc64el.iso</url>
-+      <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-ppc64el.iso</url>
-       <iso>
-         <volume-id>Ubuntu-Server 18.10(.\d)? ppc64</volume-id>
-       </iso>
-     </media>
-     <media arch="s390x">
--      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/cosmic-server-s390x.iso</url>
-+      <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-s390x.iso</url>
-       <iso>
-         <volume-id>Ubuntu-Server 18.10(.\d)? s390x</volume-id>
-       </iso>
-@@ -80,4 +89,4 @@
-       <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
-     </installer>
-   </os>
--</libosinfo>
-\ No newline at end of file
-+</libosinfo>
--- 
-2.19.1
-
diff --git a/SOURCES/0009-silverblue-Adjust-ostree-ref-name-for-f29.patch b/SOURCES/0009-silverblue-Adjust-ostree-ref-name-for-f29.patch
deleted file mode 100644
index ff6d54e..0000000
--- a/SOURCES/0009-silverblue-Adjust-ostree-ref-name-for-f29.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 34845fefc2ef86537713138b657ea6b4969e6d0a Mon Sep 17 00:00:00 2001
-From: Micah Abbott <miabbott@redhat.com>
-Date: Fri, 7 Dec 2018 09:24:23 +0100
-Subject: [PATCH] silverblue: Adjust ostree ref name for f29+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Versions of Fedora Silverblue from 29 onward will use an ostree ref
-name in the format `fedora/<version>/<arch>/silverblue` instead of
-`fedora/<version>/<arch>/workstation`
-
-Ref:  https://pagure.io/pungi-fedora/pull-request/640
-      https://pagure.io/teamsilverblue/issue/29
-
-Signed-off-by: Micah Abbott <miabbott@redhat.com>
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- .../fedoraproject.org/silverblue-kickstart-desktop.xml     | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml b/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml
-index 80fe29f..b3f9cdf 100644
---- a/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml
-+++ b/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml
-@@ -59,7 +59,14 @@ volgroup VolGroup00 --pesize=32768 pv.2
- logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
- logvol / --fstype xfs --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
- 
-+<xsl:choose>
-+  <xsl:when test="os/version &lt; 29">
- ostreesetup --osname="fedora-workstation" --remote="fedora-<xsl:value-of select="os/version"/>" --url="file:///ostree/repo" --ref="fedora/<xsl:value-of select="os/version"/>/<xsl:value-of select="config/hardware-arch"/>/workstation" --nogpg
-+  </xsl:when>
-+  <xsl:otherwise>
-+ostreesetup --osname="fedora-silverblue" --remote="fedora-<xsl:value-of select="os/version"/>" --url="file:///ostree/repo" --ref="fedora/<xsl:value-of select="os/version"/>/<xsl:value-of select="config/hardware-arch"/>/silverblue" --nogpg
-+  </xsl:otherwise>
-+</xsl:choose>
- graphical
- reboot
- 
--- 
-2.19.1
-
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
deleted file mode 100644
index c2c4e09..0000000
--- a/SOURCES/0010-rhel-8.0-Update-entry-to-also-match-8.0.x.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From e7a1af1fd70ceaa4b013ea6186a5c3ca7a47e3e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-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 <fidencio@redhat.com>
----
- 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 @@
-     <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="it">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>
--    <upgrades id="http://redhat.com/rhel/7.5"/>
--    <derives-from id="http://redhat.com/rhel/7.5"/>
-+    <codename>Ootpa</codename>
-+    <upgrades id="http://redhat.com/rhel/7.6"/>
-+
-+    <release-date>2018-05-07</release-date>
-+
-+    <devices>
-+      <device id="http://pcisig.com/pci/1b36/0100"/> 
-+      <device id="http://pcisig.com/pci/8086/2415"/> 
-+      <device id="http://usb.org/usb/80ee/0021"/> 
-+      <device id="http://pcisig.com/pci/8086/2668"/> 
-+      <device id="http://pcisig.com/pci/1af4/1001"/> 
-+      <device id="http://pcisig.com/pci/1af4/1000"/> 
-+      <device id="http://pcisig.com/pci/1af4/1003"/> 
-+      <device id="http://pcisig.com/pci/1af4/1005"/> 
-+      <device id="http://pcisig.com/pci/1033/0194"/> 
-+      <device id="http://pcisig.com/pci/1b36/0004"/> 
-+      <device id="http://pcisig.com/pci/1af4/1041"/> 
-+      <device id="http://pcisig.com/pci/1af4/1042"/> 
-+      <device id="http://pcisig.com/pci/1af4/1043"/> 
-+      <device id="http://pcisig.com/pci/1af4/1044"/> 
-+      <device id="http://pcisig.com/pci/1af4/1045"/> 
-+      <device id="http://pcisig.com/pci/1af4/1048"/> 
-+      <device id="http://pcisig.com/pci/1af4/1049"/> 
-+      <device id="http://pcisig.com/pci/1af4/1052"/> 
-+      <device id="http://qemu.org/chipset/x86/q35"/> 
-+      <device id="http://pcisig.com/pci/8086/10d3"/> 
-+      <device id="http://pcisig.com/pci/8086/293e"/> 
-+    </devices>
- 
-     <media arch="x86_64">
-       <iso>
-         <system-id>LINUX</system-id>
--        <volume-id>RHEL-8-0-BaseOS-x86_64</volume-id>
-+        <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
-       </iso>
-       <kernel>isolinux/vmlinuz</kernel>
-       <initrd>isolinux/initrd.img</initrd>
-@@ -32,7 +59,7 @@
-     <media arch="ppc64le">
-       <iso>
-         <system-id>PPC</system-id>
--        <volume-id>RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le</volume-id>
-+        <volume-id>RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
-       </iso>
-       <kernel>ppc/ppc64/vmlinuz</kernel>
-       <initrd>ppc/ppc64/initrd.img</initrd>
-@@ -41,17 +68,72 @@
-     <media arch="aarch64">
-       <iso>
-         <system-id>LINUX</system-id>
--        <volume-id>RHEL-8-0-BaseOS-aarch64</volume-id>
-+        <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
-       </iso>
-     </media>
- 
-     <media arch="s390x">
-       <iso>
-         <system-id>LINUX</system-id>
--        <volume-id>RHEL-8-0-BaseOS-s390x</volume-id>
-+        <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
-       </iso>
-     </media>
- 
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+
-+    <tree arch="ppc64le">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>ppc64le</arch>
-+      </treeinfo>
-+    </tree>
-+
-+    <tree arch="s390x">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>s390x</arch>
-+      </treeinfo>
-+    </tree>
-+
-+    <tree arch="x86_64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>x86_64</arch>
-+      </treeinfo>
-+    </tree>
-+
-+    <tree arch="aarch64">
-+      <treeinfo>
-+        <family>Red Hat Enterprise Linux</family>
-+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
-+        <arch>aarch64</arch>
-+      </treeinfo>
-+    </tree>
-+
-+    <resources arch="ppc64le">
-+      <minimum>
-+        <n-cpus>1</n-cpus>
-+        <cpu>1000000000</cpu>
-+        <ram>2147483648</ram>
-+        <storage>10737418240</storage>
-+      </minimum>
-+
-+      <recommended>
-+        <cpu>4000000000</cpu>
-+        <ram>2147483648</ram>
-+        <storage>21474836480</storage>
-+      </recommended>
-+    </resources>
-+
-     <resources arch="all">
-       <minimum>
-         <n-cpus>1</n-cpus>
--- 
-2.21.0
-
diff --git a/SOURCES/0011-win-Add-win-2k19-entry.patch b/SOURCES/0011-win-Add-win-2k19-entry.patch
deleted file mode 100644
index beca9e7..0000000
--- a/SOURCES/0011-win-Add-win-2k19-entry.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ef0ed26150d8eab03a00d7f11a955dcfb863d7af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-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 <fidencio@redhat.com>
----
- 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 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<libosinfo version="0.0.1">
-+
-+  <os id="http://microsoft.com/win/2k19">
-+    <short-id>win2k19</short-id>
-+    <name>Microsoft Windows Server 2019</name>
-+    <version>10.0</version>
-+    <vendor>Microsoft Corporation</vendor>
-+    <vendor xml:lang="ca">Microsoft Corporation</vendor>
-+    <vendor xml:lang="de">Microsoft Corporation</vendor>
-+    <vendor xml:lang="es">Microsoft Corporation</vendor>
-+    <vendor xml:lang="fr">Microsoft Corporation</vendor>
-+    <vendor xml:lang="id">Microsoft Corporation</vendor>
-+    <vendor xml:lang="it">Microsoft Corporation</vendor>
-+    <vendor xml:lang="ja">Microsoft Corporation</vendor>
-+    <vendor xml:lang="pl">Microsoft Corporation</vendor>
-+    <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
-+    <vendor xml:lang="uk">Корпорація Microsoft</vendor>
-+    <family>winnt</family>
-+    <distro>win</distro>
-+    <derives-from id="http://microsoft.com/win/2k16"/>
-+    <upgrades id="http://microsoft.com/win/2k16"/>
-+
-+    <release-date>2018-10-02</release-date>
-+
-+    <resources arch="x86_64">
-+      <minimum>
-+        <cpu>1400000000</cpu>
-+        <n-cpus>1</n-cpus>
-+        <ram>536870912</ram>
-+        <storage>34359738368</storage>
-+      </minimum>
-+
-+      <recommended>
-+        <cpu>2000000000</cpu>
-+        <ram>2147483648</ram>
-+        <storage>42949672960</storage>
-+      </recommended>
-+    </resources>
-+
-+  </os>
-+</libosinfo>
--- 
-2.21.0
-
diff --git a/SOURCES/osinfo-db-20181011.tar.xz.asc b/SOURCES/osinfo-db-20181011.tar.xz.asc
deleted file mode 100644
index 296280d..0000000
--- a/SOURCES/osinfo-db-20181011.tar.xz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABAgAGBQJbv363AAoJEO6SbCvazBd7oIEQAJF9X2BkSYVSdhyrBjTvJmMZ
-64jue7JJT0UxaFQXsivpCjRHexlb6V3m8z0G8fuT0rwMt+h8Ls3MUDw8ITP0QVX1
-Agm6Lrs8S5dBcer5SzW2UN6vwfTUFsqk3fok6iABLXky61I8fcD6iZBY9/yP1Ck+
-GB2t3tcgpgZirf7qv5hBwn6nbR3z5ooADdGX+xoJ9rC/BL3X9EzfdNql8R89voW8
-nDSW7ekDzu58jSfR8ne8WtLJXKn5c59oyDAMcQ9kKquAQDNU2PmlD3YWI/To9iSh
-7Hd6yXnO+6nZELcb5PPtjjY4zDxXYPO1fySa8cnn5rBx4mDZvZmy5wxvyoQWbau5
-M55KKWZ/yRkFXQQ8bandWWCrTnwsgFVckya9Ij5P++AfvJbR/gAcBE8bsg7g73pq
-S7hvm1LypI0VjHyqQXln8/yYCxsWpka21D3b22QK0GK26QmaOlBZUtdDt1OyFq9S
-T+7aNL2/S3Et8ijpeaow4tviHp9bHpI0vAnkMNtKfVeK/Z8if8k3ywv4EWpJjewa
-J4tjqNL9Wf9caQUF5gcDkdv1BiG+3wJuawzKTT7/VQTLLnAOJgLiJX8YOAlR44+5
-s3uyek4h5G+mVCJ1vpVS+qLY5M3KpANLdKfAxBxhlP2MictcWkwkIpEAwDgV4dHJ
-nArs7EBLfuSmrgk21PPO
-=3INk
------END PGP SIGNATURE-----
diff --git a/SOURCES/osinfo-db-20190611.tar.xz.asc b/SOURCES/osinfo-db-20190611.tar.xz.asc
new file mode 100644
index 0000000..6df1f68
--- /dev/null
+++ b/SOURCES/osinfo-db-20190611.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEECbnI/yI+8ROvoGo57pJsK9rMF3sFAlz/o8gACgkQ7pJsK9rM
+F3u0lxAAvPfT4OsLaRKprmckJ0UArEmE1ki4mB83KrU3q9ctxitA0tnNHTNlnJ83
+nHNNVjEkDrGH27cstzXT0zRxzGR2z4xyxPRSGwHTmzmT24Tf+RRuYKmqOrYXeaYL
+fAdn3TvhlLZxglutBWZowWJesaGAnpht74uIJZx62ZtsKrzNQfnhOJmIE8+FWs6f
+WRUWSAwq9wtHVlje0mDl2ak99GOXDoxcsW4cbEHm0nWGFvo3BsbCdd7ioFesFzet
+ELG/vDSi6jxbk/93OE3KTn4VAz2FHsc2o8trtbzy1a/kPcic85Q7JqeLBnWCgBwQ
+8u5fRlOyH3Zt8JfDO8OVy9tTULo4HXPnoCrgKHEVuI2tnaBdROS0FmKOfLyw/+Ql
+Oqbf/YiEMoSQ38cdMdgXb3F5Z45eSrIscQjqabYi71NUtzlCHPh8qJ/4o0XJqgNp
+yOT3j/9PTxig7hngPpXugyaeiqutGpyUk2n+whbUwOT8IFZhAQ4cSpv0OMqB6hqx
+c6rQRMYHYuk79krZV1SUrpH0cZT+OvemYX//Uu96NbYezi3N/2WPkqxfEK6GhnKV
+5MUcP6HXO/7XwrPxjQjmMFeC6FBgGOZ/XbtxUjvpIs3vzZNjBYTHvQligIbwb6V5
+rDAGycEJjzguQVG9XuA6ecTOrikz5UPG8CxZfbMHN4pJd5Usmhk=
+=A1Os
+-----END PGP SIGNATURE-----
diff --git a/SPECS/osinfo-db.spec b/SPECS/osinfo-db.spec
index b35eb4d..d0c6547 100644
--- a/SPECS/osinfo-db.spec
+++ b/SPECS/osinfo-db.spec
@@ -4,30 +4,22 @@
 
 Summary: osinfo database files
 Name: osinfo-db
-Version: 20181011
-Release: 8%{?dist}.1
+Version: 20190611
+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/
+
+### Downstream Patches ###
+Patch0001: 0001-rhel-Add-rhel-8.1.patch
+Patch0002: 0002-rhel-Add-rhel-7.7.patch
+
 BuildRequires: intltool
 BuildRequires: osinfo-db-tools
 BuildArch: noarch
 Requires: hwdata
 
-### Downstream Patches ###
-Patch0001: 0001-rhel-Add-rhel-7.6-media-info.patch
-Patch0002: 0002-rhel-Add-rhel-8-media-info.patch
-Patch0003: 0003-install-script-Add-JeOS-support-for-rhel-8.patch
-Patch0004: 0004-install-script-Add-Desktop-support-for-rhel-8.patch
-Patch0005: 0005-debian-testing-upgrades-derives-from-debian-9.patch
-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
 hypervisor platforms to facilitate the automated configuration and
@@ -39,7 +31,7 @@ for p in %patches ; do
     %__patch -p1 -i $p
 done
 
-# Remove spurious leftovers frm when applying the patches
+# Remove spurious leftovers from when applying the patches
 find ../%{name}-%{version}/ -name "*.orig" -exec rm -f {} \;
 
 # For us to be able to apply patches on top of a rebase, we:
@@ -65,9 +57,21 @@ osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
 %{_datadir}/osinfo/schema
 
 %changelog
-* Wed May 29 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-8.1
-- Resolves: rhbz#1714755 - rhel-8.0.x is not detected as rhel-8.0
-- Resolves: rhbz#1714748 - Add win2019 to libosinfo
+* Wed Jun 12 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190611-1
+- Update to v20190611 release
+- Resolves: rhbz#1699990 - Rebase to the latest upstream release
+
+* Thu May 23 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190504-2
+- Add rhel-8.1 & rhel-7.7 entry
+- Resolves: rhbz#1713245 - Add rhel-8.1 and rhel-7.7 entries
+
+* Fri May 10 2019 Fabiano Fidêncio <fidencio@redhat.com> - 20190504-1
+- Update to v20190504 release
+- Resolves: rhbz#1699990 - Rebase to the latest upstream release
+- Resolves: rhbz#1689817 - virt-manager cannot detect operating system name
+                           for rhel8.0.0 tree automatically
+- Resolves: rhbz#1703480 - rhel8.0.x is not detected as rhel8.0
+- Resolves: rhbz#1685364 - Add win2019 to libosinfo
 
 * Fri Dec 07 2018 Fabiano Fidêncio <fidencio@redhat.com> - 20181011-8
 - Resolves: rhbz#1656917 - backport change to support Fedora 29 Silverblue