From ba8f7411b49b6bd3b9404eeeb742eb21c9083a37 Mon Sep 17 00:00:00 2001
From: Ben Cotton <bcotton@fedoraproject.org>
Date: Oct 30 2019 17:46:56 +0000
Subject: Remove hacks for images that build in F31 release.


Fixes #989
Fixes #990
Fixes #991

---

diff --git a/labs.fedoraproject.org/data/content/design-suite/download/index.html b/labs.fedoraproject.org/data/content/design-suite/download/index.html
index 4ca1cbd..df4a6ae 100644
--- a/labs.fedoraproject.org/data/content/design-suite/download/index.html
+++ b/labs.fedoraproject.org/data/content/design-suite/download/index.html
@@ -18,8 +18,7 @@
       <div class="row">
         <div class="col-md-7 col-md-offset-5 text-left">
           <h2>${Markup(_('Download Fedora %(rel)s Design Suite')) % {'rel':global_variables.release['curr_id']}}</h2>
-          <!--<p class="gr"><a class="btn btn-success design-download-splash" href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/x86_64/iso/Fedora-Design_suite-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>-->
-          <p class="gr"><a class="btn btn-success design-download-splash" href="https://download.fedoraproject.org/pub/alt/unofficial/releases/30/x86_64/Fedora-Design_suite-Live-x86_64-30-20190427.n.1.iso" role="button">${_('Download')}</a></p>
+          <p class="gr"><a class="btn btn-success design-download-splash" href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/x86_64/iso/Fedora-Design_suite-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>
             <h5>${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Design']}</h5>
         </div>
       </div>
diff --git a/labs.fedoraproject.org/data/content/python-classroom/download/index.html b/labs.fedoraproject.org/data/content/python-classroom/download/index.html
index b3a0d76..337c53e 100644
--- a/labs.fedoraproject.org/data/content/python-classroom/download/index.html
+++ b/labs.fedoraproject.org/data/content/python-classroom/download/index.html
@@ -17,8 +17,7 @@
       <div class="row">
         <div class="col-md-7 col-md-offset-5 text-left">
           <h2>${Markup(_('Download Fedora %(rel)s Python Classroom')) % {'rel':global_variables.release['curr_id']}}</h2>
-	  <!--<p class="gr"><a class="btn btn-success python-classroom-download-splash" href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/x86_64/iso/Fedora-Python-Classroom-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>-->
-            <p class="gr"><a class="btn btn-success python-classroom-download-splash" href="https://download.fedoraproject.org/pub/alt/unofficial/releases/30/x86_64/Fedora-Python-Classroom-Live-x86_64-30-20190427.n.0.iso" role="button">${_('Download')}</a></p>
+	  <p class="gr"><a class="btn btn-success python-classroom-download-splash" href="${global_variables.path['download_spins']}/${global_variables.release['curr_id']}/Labs/x86_64/iso/Fedora-Python-Classroom-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>
             <h5>${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_Py_Class']}</h5>
         </div>
       </div>
diff --git a/spins.fedoraproject.org/data/content/lxde/download/index.html b/spins.fedoraproject.org/data/content/lxde/download/index.html
index bf4cc0d..a776702 100644
--- a/spins.fedoraproject.org/data/content/lxde/download/index.html
+++ b/spins.fedoraproject.org/data/content/lxde/download/index.html
@@ -17,8 +17,7 @@
       <div class="row">
         <div class="col-md-7 col-md-offset-5 text-left">
           <h2>${Markup(_('Download Fedora %(rel)s LXDE Desktop')) % {'rel':global_variables.release['curr_id']}}</h2>
-          <!--<p class="gr"><a class="btn btn-success lxde-download-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/x86_64/iso/Fedora-LXDE-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>-->
-            <p class="gr"><a class="btn btn-success lxde-download-splash" href="https://download.fedoraproject.org/pub/alt/unofficial/releases/30/x86_64/Fedora-LXDE-Live-x86_64-30-20190427.n.0.iso" role="button">${_('Download')}</a></p>
+          <p class="gr"><a class="btn btn-success lxde-download-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Spins/x86_64/iso/Fedora-LXDE-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>
             <h5>${Markup(_('%s GB ISO Image for 64-bit PC')) % global_variables.iso_size['x86_64_Live_LXDE']}</h5>
         </div>
       </div>