From 192831f3b6e1df487f979f591b78fbef258baade Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 25 2016 22:00:42 +0000
Subject: update image prerelease sizes


---

diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html
index 42abe34..fa72195 100644
--- a/arm.fedoraproject.org/data/content/prerelease.html
+++ b/arm.fedoraproject.org/data/content/prerelease.html
@@ -82,7 +82,7 @@
             <h3>${_('Fedora Workstation')}</h3>
             </div>
             <div class="col-sm-3 hidden-xs">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Workstation']}</p>
+            <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Workstation']}</p>
             </div>
             <div class="col-sm-5 hidden-xs">
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/armhfp/Images/Fedora-Workstation-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Workstation-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-CHECKSUM">${_('Verify')}</a></p>
@@ -100,7 +100,7 @@
             <h3>${_('KDE Plasma Desktop')}</h3>
             </div>
             <div class="col-sm-3 hidden-xs">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_KDE']}</p>
+            <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_KDE']}</p>
             </div>
             <div class="col-sm-5 hidden-xs">
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Images/armhfp/Fedora-KDE-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-CHECKSUM">${_('Verify')}</a></p>
@@ -118,7 +118,7 @@
             <h3>${_('Xfce Desktop')}</h3>
             </div>
             <div class="col-sm-3 hidden-xs">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Xfce']}</p>
+            <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Xfce']}</p>
             </div>
             <div class="col-sm-5 hidden-xs">
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Images/armhfp/Fedora-Xfce-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-CHECKSUM">${_('Verify')}</a></p>
@@ -154,7 +154,7 @@
             <h3>${_('MATE-Compiz Desktop')}</h3>
             </div>
             <div class="col-sm-3 hidden-xs">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Mate']}</p>
+            <p>${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Mate']}</p>
             </div>
             <div class="col-sm-5 hidden-xs">
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Images/armhfp/Fedora-Mate-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-CHECKSUM">${_('Verify')}</a></p>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index ac5a0f3..b5ea763 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -92,17 +92,17 @@ iso_size={
     'x86_64_Live_Cinnamon': '1.2',       # In GB
     # Lives prerelease
     'pre_i686_Live_KDE':    '1.2',       # In GB
-    'pre_x86_64_Live_KDE':  '1.2',       # In GB
+    'pre_x86_64_Live_KDE':  '1.3',       # In GB
     'pre_i686_Live_LXDE':   '947',       # In MB
-    'pre_x86_64_Live_LXDE': '941',       # In MB
+    'pre_x86_64_Live_LXDE': '925',       # In MB
     'pre_i686_Live_Xfce':   '1.0',       # In GB
-    'pre_x86_64_Live_Xfce': '918',       # In MB
+    'pre_x86_64_Live_Xfce': '1.0',       # In GB
     'pre_i686_Live_Mate':   '1.3',       # In GB
-    'pre_x86_64_Live_Mate': '1.3',       # In GB
+    'pre_x86_64_Live_Mate': '1.4',       # In GB
     'pre_i686_Live_Soas':   '662',       # In MB
     'pre_x86_64_Live_Soas': '686',       # In MB
     'pre_i686_Live_Cinnamon': '1.2',     # In GB
-    'pre_x86_64_Live_Cinnamon': '1.2',   # In GB
+    'pre_x86_64_Live_Cinnamon': '1.3',   # In GB
     # Spins
     'i686_Live_Security':  '916',       # In MB
     'x86_64_Live_Security':'940',       # In MB
@@ -128,22 +128,22 @@ iso_size={
     'pre_i686_Live_Design':    '1.7',   # In GB
     'pre_x86_64_Live_Design':  '1.7',   # In GB
     'pre_i686_Live_Sci-kde':   '2.7',   # In GB
-    'pre_x86_64_Live_Sci-kde': '2.7',   # In GB
+    'pre_x86_64_Live_Sci-kde': '2.8',   # In GB
     'pre_i686_Live_Robotics':  '2.5',   # In GB
-    'pre_x86_64_Live_Robotics':'2.5',   # In GB
+    'pre_x86_64_Live_Robotics':'2.3',   # In GB
     'pre_i686_Live_Jam':       '1.7',   # In GB
-    'pre_x86_64_Live_Jam':     '1.7',   # In GB
+    'pre_x86_64_Live_Jam':     '1.9',   # In GB
     'pre_i686_Live_Astronomy': '1.7',   # In GB
-    'pre_x86_64_Live_Astronomy':'1.7',   # In GB
+    'pre_x86_64_Live_Astronomy':'2.4',  # In GB
     # Server
     'x86_64_server_DVD':   '2.0',       # In GB
     'i386_server_DVD':     '2.1',       # In GB
     'x86_64_server_net':   '415',       # In MB
     'i386_server_net':     '458',       # In MB
     # Server prerelease
-    'pre_x86_64_server_DVD': '2.1',     # In GB
+    'pre_x86_64_server_DVD': '1.8',     # In GB
     'pre_i386_server_DVD':   '2.2',     # In GB
-    'pre_x86_64_server_net': '469',     # In MB
+    'pre_x86_64_server_net': '457',     # In MB
     'pre_i386_server_net':   '552',     # In MB
     # Workstation
     'x86_64_workstation':  '1.4',       # In GB
@@ -153,7 +153,7 @@ iso_size={
     # Workstation prerelease
     'pre_x86_64_workstation':  '1.4',   # In GB
     'pre_i386_workstation':    '1.4',   # In GB
-    'pre_x86_64_workstation_net': '467',# In MB
+    'pre_x86_64_workstation_net': '454',# In MB
     'pre_i386_workstation_net': '550',  # In MB
     # ARM
     'ARM_Workstation':     '1.1',       # In GB
@@ -166,14 +166,14 @@ iso_size={
     'ARM_SoaS':            '644',       # In MB
     # ARM prerelease
     'pre_ARM_Workstation': '1.2',       # In GB
-    'pre_ARM_Server':      '429',       # In MB
-    'pre_ARM_Minimal':     '342',       # In MB
-    'pre_ARM_KDE':         '1.2',       # In GB
-    'pre_ARM_Xfce':        '843',       # In MB
-    'pre_ARM_LXDE':        '788',       # In MB
-    'pre_ARM_Mate':        '1.1',       # In GB
+    'pre_ARM_Server':      '538',       # In MB
+    'pre_ARM_Minimal':     '422',       # In MB
+    'pre_ARM_KDE':         '1.3',       # In GB
+    'pre_ARM_Xfce':        '1.0',       # In GB
+    'pre_ARM_LXDE':        '905',       # In MB
+    'pre_ARM_Mate':        '1.3',       # In GB
     'pre_ARM_Cinnamon':    '780',       # In MB
-    'pre_ARM_SoaS':        '634',       # In MB
+    'pre_ARM_SoaS':        '700',       # In MB
     # Cloud
     'raw_x86_64_cloud':    '146',       # In MB
     'raw_i386_cloud':      '143',       # In MB
@@ -194,9 +194,9 @@ iso_size={
     'libvag_cloud':        '245',       # In MB
     'x86_64_docker':       '45',        # In MB
     # Cloud prerelease
-    'pre_raw_x86_64_cloud':    '176',   # In MB
+    'pre_raw_x86_64_cloud':    '135',   # In MB
     'pre_raw_i386_cloud':      '172',   # In MB
-    'pre_qcow2_x86_64_cloud':  '275',   # In MB
+    'pre_qcow2_x86_64_cloud':  '207',   # In MB
     'pre_qcow2_i386_cloud':    '268',   # In MB
     # Note that atomic values here get overwritten by the twoweek script.
     'pre_atomic_raw_cloud':    '???',   # In MB
diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html
index 841378c..cc4e3b7 100644
--- a/spins.fedoraproject.org/data/content/prerelease.html
+++ b/spins.fedoraproject.org/data/content/prerelease.html
@@ -70,7 +70,7 @@
     	  	  <span class="grey">${_('A complete, well-integrated Xfce Desktop.')}</span></p>
     	  	  	<div class="col-xs-6 text-center">
     	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/x86_64/iso/Fedora-Xfce-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
-    	  	  		<h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Xfce']}</h5>
+    	  	  		<h5>${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Xfce']}</h5>
   	  	  		</div>
   	  	  		<div class="col-xs-6 text-center">
 <!--    	  	  		<a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-Xfce-Live-i686-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>