[gnome-boxes/recommend-newest-oses: 1/2] wizard-source: Recommend free download of RHEL 8.0

[Felipe Borges <felipeborges src gnome org>]

commit b1d809d2299265fc803cb17ad27fc6b77dc8c5c2
Author: Felipe Borges <felipeborges gnome org>
Date:   Thu May 9 10:14:15 2019 +0200

    wizard-source: Recommend free download of RHEL 8.0
    
    RHEL 8.0 has been recently released and is now stable. So we
    shouldn't offer 7.6 anymore.
    
    We also bump/overwrite osinfo's minimum memory resources for RHEL,
    because users are expected to use the desktop variant which requires
    more RAM.

 data/osinfo/rhel-8.0.xml       | 12 +++++++++++-
 data/recommended-downloads.xml |  1 -
 src/wizard-source.vala         | 12 ++----------
 3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/data/osinfo/rhel-8.0.xml b/data/osinfo/rhel-8.0.xml
index ef888a34..c546233e 100644
--- a/data/osinfo/rhel-8.0.xml
+++ b/data/osinfo/rhel-8.0.xml
@@ -3,8 +3,18 @@
   <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
 
   <os id="http://redhat.com/rhel/8.0";>
-    <name>Red Hat Enterprise Linux 8 (Beta)</name>
     <logo>https://gitlab.gnome.org/GNOME/gnome-boxes-logos/raw/master/logos/redhat.svg</logo>
+
+    <resources arch="all">
+      <minimum>
+        <ram>1073741824</ram>
+      </minimum>
+
+      <recommended>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
   </os>
 
 </libosinfo>
diff --git a/data/recommended-downloads.xml b/data/recommended-downloads.xml
index 37a4b790..a1d8ebf9 100644
--- a/data/recommended-downloads.xml
+++ b/data/recommended-downloads.xml
@@ -9,7 +9,6 @@
   available.
  -->
 <list>
-  <os_id>http://redhat.com/rhel/7.6</os_id>
   <os_id>http://redhat.com/rhel/8.0</os_id>
   <os_id>http://fedoraproject.org/fedora/29</os_id>
   <os_id>http://fedoraproject.org/silverblue/29</os_id>
diff --git a/src/wizard-source.vala b/src/wizard-source.vala
index e0596e65..f8bc956c 100644
--- a/src/wizard-source.vala
+++ b/src/wizard-source.vala
@@ -559,16 +559,8 @@ private void on_install_rhel_button_clicked () {
         var user_agent = get_user_agent ();
         var user_agent_escaped = GLib.Uri.escape_string (user_agent, null, false);
 
-        string rhel_version = "";
-        string rhel_variant = "";
-        if (is_rhel8) {
-            rhel_version = "8";
-            rhel_variant = "&description=DVD+iso";
-        }
-
         var authentication_uri = "https://developers.redhat.com/download-manager/rest/featured/file/rhel"; +
-                                 rhel_version +
-                                 "?tag=" + user_agent_escaped + rhel_variant;
+                                 "?tag=" + user_agent_escaped;
 
         debug ("RHEL ISO authentication URI: %s", authentication_uri);
 
@@ -612,7 +604,7 @@ private bool on_rhel_web_view_decide_policy (WebKit.WebView web_view,
         return_val_if_fail (download_path.length > 0, false);
 
         if (!download_path.has_suffix (".iso")) {
-            download_path = is_rhel8 ? "/rhel8.iso" : "/rhel.iso";
+            download_path = is_rhel8 ? "/rhel-8.0-x86_64-dvd.iso" : "/rhel.iso";
         }
 
         filename = GLib.Path.get_basename (download_path);