From 557fec272845f6e57539086cf410cb4ec3920f89 Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Oct 11 2016 11:55:20 +0000 Subject: Merge branch 'f25-beta' --- diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html index 623b211..b379322 100644 --- a/arm.fedoraproject.org/data/content/prerelease.html +++ b/arm.fedoraproject.org/data/content/prerelease.html @@ -46,14 +46,14 @@

${_('Fedora Server')}

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -67,11 +67,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_Minimal']}

${_('Fedora Minimal')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -85,11 +85,11 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Workstation']}

${_('Fedora Workstation')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -103,11 +103,11 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_KDE']}

${_('KDE Plasma Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -121,11 +121,11 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Xfce']}

${_('Xfce Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -139,11 +139,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_LXDE']}

${_('LXDE Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -157,11 +157,11 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['pre_ARM_Mate']}

${_('MATE-Compiz Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -194,11 +194,11 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_SoaS']}

${_('Sugar on a Stick')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Server-25-Alpha-1.2-armhfp-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Server-25-Alpha-1.2-armhfp-CHECKSUM deleted file mode 100644 index 58303c4..0000000 --- a/arm.fedoraproject.org/static/checksums/Fedora-Server-25-Alpha-1.2-armhfp-CHECKSUM +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-Server-armhfp-25_Alpha-2-sda.raw.xz) = 006d6558e74acc3137e1a0730715796bf635b7097083057a56f17d130e7c6f99 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIhjAAoJEECJ2PL9sZyYoyEP/0bsZKPduURhNjsT4De83Jtf -QL+RiA3UC7yxSIwFiJpgYm4DLcJJq0ZbI1db0cWqqWowOQ97cwiO8b8COgA3m2o7 -t9BNTtfJ3vyoFFXum5gNqxBAnpRir3LjswvAVP8s71/YOt1+Zz5BaI7tRBzh1dld -DL+Hp3qiHKJDOeLYLW/GGSIkq+rx5uRtIhavf9JJBso3G041F8COzLtkmHBrmjWA -9dUVEVszmfHmfJ3AA5vQBFh4mX3kwR9VBsM61IMbpGQs+zqd1yLFU8Pf5xLH/Sqs -HQTPfb50icWrVSvDwR43PpyLY0fTYM+kCFySVMvi9Qu72qOR8tKf92NjwZqsl2dg -E9TrA7SQG8QfIlkd999tTc1TyIbOeDdi2Rwo7pwrTMv8FUGAf4wfqw5rMkVd57XJ -kFxrYgFodz/UjGnijUZQDIPdlUPBm73uwJjkJ7ihGof38Y53QbHpahdZ/1CKAc4p -hKve3E7JHxtfz4oJaomByx9mXo+gixYRynlld9Eam/7nrqEu8GSjGPvaFJW8RBro -ASrT15ONxglVCZ2N9P+qIOqImRmO0Rwg3MflSD/tthlMIrvt5+WQW+j/RqhnLJ0s -jBOjFgWyN3MERowRS7HKlRWmxe0r7TZZ4PAeW9yt3XEbpQOzR9TKI2tKG1CNQv4q -+LiXsGU7S6MSIVb1219L -=517X ------END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Server-25_Beta-1.1-armhfp-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Server-25_Beta-1.1-armhfp-CHECKSUM new file mode 100644 index 0000000..9bab54e --- /dev/null +++ b/arm.fedoraproject.org/static/checksums/Fedora-Server-25_Beta-1.1-armhfp-CHECKSUM @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Server-armhfp-25_Beta-1.1-sda.raw.xz) = b9b8ceefbf6f1b095ae868a080df0d2051f8c60831ccfc495d7611a976525822 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98RYAAoJEECJ2PL9sZyYV3AP/3FmTYqJeSZ44f+roqcq0zKk +xahKo7GPGuFIgw0d4b9l4+QbKil1JZNBjZj3IcLq87/9iSYzmbtcCWHEjUEluxVs +lmAcTb3VuyQzXyzRWFnXyVRdjeZl8JzDu/lawc/+LT5OB2oDApsEWc01l4Pf9oN6 +ud/DCEspnD6qe95v7C3bJ5TJ3coYgbryM4prd+ZWr1tds/udrIgUrXpfUDOV4usC +qOz3ChvtaGKfHuHQClmFYvkT94UkRfQesl7gLAwPJ3NE/BZ+mwxCe6GHSMiXOXxS +NSWA5Z+tPmNBwZVLFAI4RRTMy7fQUzlUoAlvkRjhFJT8PdCS8wSYg4yRBKMEDpJR +QFUyVOCjrlAh3ekkzlfUFeHDY2l4lT4bx5ZtwT//w8vgUG/38pE2pXCi3v3tDvMg +6aMrxhJ9ul6U571FiuGLhCHBIoye+KgwyfTdOMBOgQStP+I5k3IywuHeJuvnFUVa +x3a5vnoVbi+Uu/qgCZhKbxp57mKMQoOJ58SHZ8YoRR11EWT2fSMn7BF4eLMuy8Sl +4EPrDfuUFP/KqCTkkkQyxYIqIWKSOp/8pHCWFjNoHxUipSHv/d9JRlKqGm6PQKIX +GHXlhDMk9rueFJz8I4NtMl15UK1fTwq5QNrJh/+k6ULPk4v4PJeOHETt+FZMwUTL +hwkuyR/qgXtmKWDYJ11T +=des0 +-----END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-armhfp-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-armhfp-CHECKSUM deleted file mode 100644 index d8f1653..0000000 --- a/arm.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-armhfp-CHECKSUM +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-Minimal-armhfp-25_Alpha-2-sda.raw.xz) = 2e772fd3283f26ec46a4affaa9670a954f1f2544b679b7943326d4fd1da25bab -SHA256 (Fedora-Mate-armhfp-25_Alpha-2-sda.raw.xz) = 9a7b02c6606fc5a5a0b5dd63ff215fe18650a7391d87ca01eb2180cbb0bf967e -SHA256 (Fedora-Xfce-armhfp-25_Alpha-2-sda.raw.xz) = 6ffd937cd7616817408a9bb9de838b45d06f423d3e965cc760b64c04f06029e9 -SHA256 (Fedora-SoaS-armhfp-25_Alpha-2-sda.raw.xz) = 610162614fbebdf57dce851d7396d1ddcf5ac14fc25c91e2b7836ed6cfd052ba -SHA256 (Fedora-LXDE-armhfp-25_Alpha-2-sda.raw.xz) = 009b932998ee18478343c07f2101021b61478d392e47984602c5d411d7453279 -SHA256 (Fedora-KDE-armhfp-25_Alpha-2-sda.raw.xz) = 50eedf2bfc72c8101966a51b95df454d922d8e90d1fbacf689d2018ce92d119f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIh3AAoJEECJ2PL9sZyYzeEP/1MqVmJ0j5lK5v0lZ+SxPhb8 -vFg6TNFkav1Evb0HLdsxdUtEkubMVdFQEXyE+Gn0PI2Il9sfsmibjPeI0Wso7XCW -N2wPMkeeu1rDBfNy8mZR+NhvKlP2NAlzr0hKCQLQtoT2yM1CD7N9rmR7nIA0VLAS -hOdk4LsoxpzUqjoS1Ac9GooLHuQh8QBxR4Mii6MiU6DDCkNKeAYtCSrVNC+CLv9P -5l6JRofQpgTy2SP++NULnlFIbGyjsGzXVH8pV+FGb7i3G3QE3fW8R1kix3woxknj -X+rlwwZ1oxV8YjFANq7P983dXAYZ6l4h3g38Jd9rlEr6XnWmorcrSuQ6v2VwybhB -qp3xeIr1e/tb416ruvd+BJ0P88a9n97eiTf+T7lXZ7ARPcG+/u8ACs0gAIUjirNg -DAPQhkbn/UUSB017s/CdnFGlNioGPP3pclO7rief6Qug4eOBWnD8xnf6SyH0izuT -7i/LC9sC0I/s1PqnS0AQphuK9axucdi/kbEx9ejdXRy0Iov3mbXpMJ4gsdDMovSE -hwJM/Ns9Mu4YHSst/Ei1P6sDr53+cHuR7Q5N00srAdmb0loomoDiQT8nIUZ3D7sQ -IwbVCOWdkZGUFlgh33xufsaotiS/RP/cwgCPdM51Phg1EtYpNkE84nyI/T5/I8Zy -xT4Ht6Ds3B/HSOE4qyG/ -=ekn6 ------END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-armhfp-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-armhfp-CHECKSUM new file mode 100644 index 0000000..2a48a79 --- /dev/null +++ b/arm.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-armhfp-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Xfce-armhfp-25_Beta-1.1-sda.raw.xz) = 1776e4791e51dcb03de29a5e133327a91f2bcf495565e9674ec3f1e8b75aafab +SHA256 (Fedora-Minimal-armhfp-25_Beta-1.1-sda.raw.xz) = 6d183114c6d4707bd5d8981f662b664d5b8190f400792f4ebd2e18f3ffdf7127 +SHA256 (Fedora-LXDE-armhfp-25_Beta-1.1-sda.raw.xz) = 1d4d4c39c9c35536cef701d56a6995a52fc48d1241b51c230e001567f642b018 +SHA256 (Fedora-KDE-armhfp-25_Beta-1.1-sda.raw.xz) = 836edaccbc5a46661ab1ccc7fbe1efa53be211eda5d615e70dee2d338772a424 +SHA256 (Fedora-SoaS-armhfp-25_Beta-1.1-sda.raw.xz) = 3bc1548e07e4b0b63aa0d67b73c4da6ef4a598659358c03f45f747119cbd4bd7 +SHA256 (Fedora-Mate-armhfp-25_Beta-1.1-sda.raw.xz) = 89f50bc26bd2b5060a973448be97c7ad106fa54168010ab661edec7e820c5851 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98RqAAoJEECJ2PL9sZyYe2UP/inNYPIiDfVxNZYP/Bhv/8Zd +8flhpJM4NWq1dyXkBrAtR5kFyP3eCzVuq4f4TWkt377ksGBzZkdzL2La1futnM/a +Uq09KE3JamFrWGMRu1ww3y0+DyhLVP0B5ZusbjCbHblqRFgE2zwbI+saMTIsxMhK +k27ePIVOYTXuZqfHO1dV+WIb5zPM/lHsU3Z8WWJX7FoFSjzVTjXWUgwREEUrM0Hg +inXXyRGqmlVS6DFlt2ZxJsWjw163HE1UDIeFic0JVqq8X91lg/YgwZ1bUxdFpPG0 +kh9ps86yjqw4G7O0amgJ3CThVxCd7XCR9gLME0321sU2+EgwXu2WvlrfS+tYH7Nh +4/l9O+8ho2S3xKAi2o0Ue9loDkYIibujkyIHPBUmxpVd8sEhYedF33Tz8Pt9oj5C +3fzbCyZkLQ+vmIgGx5N7ku1QY9jsgyX9zyjdretzRVDHg/GEFkvr1UBirvEYnaB5 +a05juaXryUg85AyuBkXp40/GUAWH1zQdLDSrSSq7A0TEJUQw2YmprXSga2/Z082N +11vH0Jan4pZyqTA/v1Qxghb8isg6LFFvA5AvUCYHKcd2+vZl1BVCkTEPV0n+K2Be +I+NwXETtSLLQ1Ab4Q3F7R+s8JhDF2fQ3Wqoh1dOP6qZxSXZtkxPNhiEu2pIM7M/j +VB4lWktDA7s3IhtFqrFM +=mXsC +-----END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Workstation-25-Alpha-1.2-armhfp-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Workstation-25-Alpha-1.2-armhfp-CHECKSUM deleted file mode 100644 index 6c96097..0000000 --- a/arm.fedoraproject.org/static/checksums/Fedora-Workstation-25-Alpha-1.2-armhfp-CHECKSUM +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-Workstation-armhfp-25_Alpha-2-sda.raw.xz) = 4cd8c039cd29f08949bfcae0807ee1fb0ab3e177ae6c0cc7b5d1c17492ababee ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIiFAAoJEECJ2PL9sZyYiV8P/A3yNjcXBeMVfeb/5VDXqFGr -MTrAgezAps5IrSrCFm78YKwrj3qzGDbmxqMXOzXu9QN5TueMXm+D6qO9FxxVHpzp -FmqUZyHTDmUwVJpO0mXeqV5qABdpcQdGJYayEDiT+q4euT0YOiifaSgg7p8XlUDy -Gf1vzDg7Qxpqx3QuldcqoEAlknziNpladsLR2CRHb7BwBVuWEJ7dOV+Swb4FfO0K -V3sWleaND/NWDJ6YMCD6n6GJRqxrnaC01WefIC03lLNx0TYdpNFjN8Q9CN0AxTf8 -3YjZcW9Ol814DMQJLks4RYejy6KtElS/lIaoOabNB9ZDEqPmH9RAYOm1va5B0fWH -jyU+jJJFYLVSW1pbZoehEdaB+XbjGdfQi4JhlLrdr6RkFpEWRkJ6dP7vSUX0MqmT -BP4DKJTw2/P3LRKGNUcFYlo4Ppa0XUCoAbMqADzEh4Q4HhQOZM5pJl7TSYjMne4g -GZs4/Rppnta3gXwc7KMA4tKqHJSLAa4Rf/jN/8kQ11QI5ma3pVTEyhR2pd1qZitd -t74fVlfoEpkMozP1vYPmIOELdt5MVFflPSw58Mxk3LelwnNccpFp17QITBk9XEM5 -B0uRQaMQaUCHBgTjmbHKmRl6S03AkhTcKvzDE+LG5veIMReRGhnXAYe4kbwWqOYl -oHDaz3jixR06htCwt50C -=NfXz ------END PGP SIGNATURE----- diff --git a/arm.fedoraproject.org/static/checksums/Fedora-Workstation-25_Beta-1.1-armhfp-CHECKSUM b/arm.fedoraproject.org/static/checksums/Fedora-Workstation-25_Beta-1.1-armhfp-CHECKSUM new file mode 100644 index 0000000..255b8cd --- /dev/null +++ b/arm.fedoraproject.org/static/checksums/Fedora-Workstation-25_Beta-1.1-armhfp-CHECKSUM @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Workstation-armhfp-25_Beta-1.1-sda.raw.xz) = ec0c406e01759fd75b026f2ca538dd06cd8867f0e55ad1d1ae8caa5f163de3f9 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98R7AAoJEECJ2PL9sZyYilwQALHaeA53bbCi9KR+jC6AztMS +veR7YyHQYCtQQlDEHYzyHxAVU52Ty+jfGWYWiWErYTG6OLNbSz+82tLhM5NoU8fA +2eBD3W22fdS28we1692+63fyQlIYTGXnLwRAX/7ZeuO/iQ6J3tFuiNUWZw55rdzk +ActaVmW1hB5D6piBMQR3SPcU38qaiSBBopT0O4gQhZZRs+zxYuY3dyATuNijbOCt +PcJtptdhIJGACGUokI3smGlpj/E+P25GnzqhPxQ/v0LYOeiX+XH51qdZj+568MtW +QYHQNsVdyNU3WoyF/ctxvu6XaJaR6VN591KUZ+qKNfTYGefGfeplCRVb1zVY014K +CyiCoWMoOPzOYf8AQQNgz2pcun3rcG0gNqYS/LupbGO39GLvsPZagDM0gVA1n+M0 +UIlbp7LYRsEhBqSHeEjGY85aINC4e9EwM7Xrf2FadeWcpJ4Lvg8bee7vFjN5GjSt +SyQlCmu3cvAETvhTEzH772EswHm/FHuFbJjLv0v846tblXuYOnxl1VQgafITdZPu +jpPW36xPn1FbSf2ei+0BSyPfcfjhq9f34Xeu0jHRt4J/sRsljLi7Nr/fs7VUv9HR +WNJ6aImog7Vngc/kdx7LC2wf1NHasyhaFzOXCl6A1cvydBjJ8O+fcbY12WwXUqt5 +/4IetfUqEjMlV37RluKe +=k7WQ +-----END PGP SIGNATURE----- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index a98f5ff..56089ae 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -7,12 +7,12 @@ release={ 'next_id': '25', 'curr_name': '', 'next_name': '', - 'curr_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_arm_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_ppc64_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_s390_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_cloud_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_cloud_AMI_state': 'Alpha', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_arm_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_ppc64_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_s390_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_AMI_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) 'prev_arm_id': '23', 'prev_ppc64_id': '23', 'prev_s390_id': '23', @@ -43,8 +43,8 @@ release={ 'pre_cloud_AMI_atomic_composedate': '20150915', 'RC_gold': '1.2', # insert the number of the RC version declared GOLD 'RC_build': '1.2', # sometimes releng use the RC build - 'RC_pre_gold': '1.2', # insert the number of the prerelease RC version declared GOLD - 'RC_pre_build': '2', # sometimes releng use the RC build + 'RC_pre_gold': '1.1', # insert the number of the prerelease RC version declared GOLD + 'RC_pre_build': '1', # sometimes releng use the RC build 'atomic_freshness': False, 'atomic_age': '???', @@ -68,6 +68,11 @@ path={ } iso_size={ + + #Media + 'macosx': '20.7', # In MB + 'windows': '14.2', # In MB + # Legacy 'x86_64_DVD': '4.3', # In GB 'i386_DVD': '4.4', # In GB @@ -100,15 +105,15 @@ iso_size={ 'pre_i686_Live_KDE': '1.4', # In GB 'pre_x86_64_Live_KDE': '1.3', # In GB 'pre_i686_Live_LXDE': '1.0', # In GB - 'pre_x86_64_Live_LXDE': '900', # In MB + 'pre_x86_64_Live_LXDE': '910', # In MB 'pre_i686_Live_Xfce': '1.1', # In GB 'pre_x86_64_Live_Xfce': '1.0', # In GB 'pre_i686_Live_Mate': '1.4', # In GB 'pre_x86_64_Live_Mate': '1.4', # In GB - 'pre_i686_Live_Soas': '773', # In MB - 'pre_x86_64_Live_Soas': '691', # In MB - 'pre_i686_Live_Cinnamon': '1.5', # In GB - 'pre_x86_64_Live_Cinnamon': '1.4', # In GB + 'pre_i686_Live_Soas': '763', # In MB + 'pre_x86_64_Live_Soas': '684', # In MB + 'pre_i686_Live_Cinnamon': '1.4', # In GB + 'pre_x86_64_Live_Cinnamon': '1.3', # In GB # Spins 'i686_Live_Security': '1.2', # In GB 'x86_64_Live_Security':'1.1', # In GB @@ -127,27 +132,27 @@ iso_size={ 'i686_Live_Astronomy': '2.5', # In GB 'x86_64_Live_Astronomy':'2.3', # In GB # Spins prerelease - 'pre_i686_Live_Security': '1.2', # In GB + 'pre_i686_Live_Security': '1.1', # In GB 'pre_x86_64_Live_Security':'1.1', # In GB 'pre_i686_Live_Games': '3.8', # In GB 'pre_x86_64_Live_Games': '3.7', # In GB 'pre_i686_Live_Elab': '2.5', # In GB 'pre_x86_64_Live_Elab': '2.5', # In GB - 'pre_i686_Live_Design': '2.1', # In GB + 'pre_i686_Live_Design': '2.0', # In GB 'pre_x86_64_Live_Design': '2.0', # In GB - 'pre_i686_Live_Sci-kde': '3.0', # In GB - 'pre_x86_64_Live_Sci-kde': '2.9', # In GB - 'pre_i686_Live_Robotics': '2.3', # In GB + 'pre_i686_Live_Sci-kde': '2.9', # In GB + 'pre_x86_64_Live_Sci-kde': '2.8', # In GB + 'pre_i686_Live_Robotics': '2.2', # In GB 'pre_x86_64_Live_Robotics':'2.2', # In GB 'pre_i686_Live_Jam': '2.0', # In GB 'pre_x86_64_Live_Jam': '1.9', # In GB 'pre_i686_Live_Astronomy': '2.4', # In GB 'pre_x86_64_Live_Astronomy':'2.3', # In GB # Server - 'x86_64_server_DVD': '1.7', # In GB - 'i386_server_DVD': '2.1', # In GB - 'x86_64_server_net': '441', # In MB - 'i386_server_net': '458', # In MB + 'x86_64_server_DVD': '1.9', # In GB + 'i386_server_DVD': '2.0', # In GB + 'x86_64_server_net': '470', # In MB + 'i386_server_net': '464', # In MB # Server prerelease 'pre_x86_64_server_DVD': '1.7', # In GB 'pre_i386_server_DVD': '2.2', # In GB @@ -161,8 +166,8 @@ iso_size={ # Workstation prerelease 'pre_x86_64_workstation': '1.3', # In GB 'pre_i386_workstation': '1.4', # In GB - 'pre_x86_64_workstation_net': '457',# In MB - 'pre_i386_workstation_net': '486', # In MB + 'pre_x86_64_workstation_net': '407',# In MB + 'pre_i386_workstation_net': '530', # In MB # ARM 'ARM_Workstation': '1.2', # In GB 'ARM_Server': '487', # In MB @@ -174,14 +179,14 @@ iso_size={ 'ARM_SoaS': '722', # In MB # ARM prerelease 'pre_ARM_Workstation': '1.2', # In GB - 'pre_ARM_Server': '553', # In MB - 'pre_ARM_Minimal': '442', # In MB + 'pre_ARM_Server': '1.7', # In GB + 'pre_ARM_Minimal': '431', # In MB 'pre_ARM_KDE': '1.4', # In GB 'pre_ARM_Xfce': '1.0', # In GB - 'pre_ARM_LXDE': '913', # In MB + 'pre_ARM_LXDE': '934', # In MB 'pre_ARM_Mate': '1.3', # In GB 'pre_ARM_Cinnamon': '780', # In MB - 'pre_ARM_SoaS': '713', # In MB + 'pre_ARM_SoaS': '693', # In MB # Cloud 'raw_x86_64_cloud': '128', # In MB 'raw_i386_cloud': '143', # In MB @@ -198,11 +203,11 @@ iso_size={ 'atomic_libvag_cloud': '???', # In MB 'VBvag_cloud': '254', # In MB 'libvag_cloud': '245', # In MB - 'x86_64_docker': '45', # In MB + 'x86_64_docker': '40', # In MB # Cloud prerelease - 'pre_raw_x86_64_cloud': '148', # In MB + 'pre_raw_x86_64_cloud': '226', # In MB 'pre_raw_i386_cloud': '172', # In MB - 'pre_qcow2_x86_64_cloud': '231', # In MB + 'pre_qcow2_x86_64_cloud': '330', # 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 @@ -210,8 +215,8 @@ iso_size={ 'pre_atomic_VBvag_cloud': '???', # In MB 'pre_atomic_libvag_cloud': '???', # In MB 'pre_x86_64_docker': '40', # In MB - 'pre_VBvag_cloud': '257', # In MB - 'pre_libvag_cloud': '248', # In MB + 'pre_VBvag_cloud': '237', # In MB + 'pre_libvag_cloud': '227', # In MB # Manual atomic prerelease image sizes go here. 'manual_pre_atomic_raw_cloud': '100', # In MB 'manual_pre_atomic_qcow2_cloud': '200', # In MB diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py index b631ce0..73acff0 100755 --- a/getfedora.org/build/fedimg_vars.py +++ b/getfedora.org/build/fedimg_vars.py @@ -85,7 +85,7 @@ def collect(release): 'HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', 'GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', }), - ("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_build}.x86_64", { + ("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_gold}.x86_64", { 'pre_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', 'pre_GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', 'pre_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard', diff --git a/getfedora.org/data/content/cloud/prerelease/docker.html b/getfedora.org/data/content/cloud/prerelease/docker.html index 577e5e3..e9e74bb 100644 --- a/getfedora.org/data/content/cloud/prerelease/docker.html +++ b/getfedora.org/data/content/cloud/prerelease/docker.html @@ -85,10 +85,10 @@

${_('You can easily load this Docker image into your running Docker daemon using command:')}

- 
docker load -i Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_build']}.x86_64.tar.xz
+ 
docker load -i Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64.tar.xz

${_('Following command can be used to spawn a container running bash inside:')}

- 
docker run -it --rm Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_build']}.x86_64 bash
- ${_('Download')} + 
docker run -it --rm Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64 bash
+ ${_('Download')}

${_('64-bit %sMB raw.xz Image') % global_variables.iso_size['pre_x86_64_docker']}

@@ -129,7 +129,7 @@

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

- ${_('Docker 64bit!')} + ${_('Docker 64bit!')}
diff --git a/getfedora.org/data/content/cloud/prerelease/index.html b/getfedora.org/data/content/cloud/prerelease/index.html index beb14df..d50506d 100644 --- a/getfedora.org/data/content/cloud/prerelease/index.html +++ b/getfedora.org/data/content/cloud/prerelease/index.html @@ -87,13 +87,13 @@
${_('qcow2 Image')}

${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_qcow2_x86_64_cloud']}

${_('Raw Image')}

${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_raw_x86_64_cloud']}

@@ -111,11 +111,11 @@ @@ -475,7 +475,7 @@ End Vagrant -->

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

- ${_('Validate 64bit!')} + ${_('Validate 64bit!')}
+
@@ -60,20 +77,82 @@ ${_('Read all the key milestones of the release schedule...')} + +
+

${_('Running Pre-Release Versions of Fedora Workstation')}

+

${_('To run a prerelease version of Fedora Workstation, you will need:')}

+ +

${_('WARNING: This procedure destroys all data on your USB media. Make sure to back up any important files from your USB media before you do this.')}

+
    +
  1. ${_('Download the Fedora Media Writer app below.')}
    2. +
  2. ${_('Download the desired ISO image.')}
    3. +
  3. ${_('Open the Fedora Media Writer app. You may need to provide a password to give the app the right permissions.')}
    4. +
  4. ${_('Select "Custom OS..." from the list.')}
    5. +
  5. ${_('On the Custom OS page, select the "Select Live ISO" button.')}
    6. +
  6. ${_('In the file selection window, locate and select the ISO image you downloaded.')}
    7. +
  7. ${_('Insert your USB stick in the computer. If you used your USB stick previously to create live media, you may need to restore it to factory settings. The app will ask you whether to do so in this case.')}
    8. +
  8. ${_('Select "Create Live USB" to write the image. Wait until the process is finished before you remove the media and close the app.')}
    9. +
+

${_('Optionally, you may install Fedora Workstation to a laptop or desktop computer that has at least 1 GHz processor, 1 GB RAM, and 10 GB space available. To do this, run the live version of Fedora Workstation from your USB flash drive on the computer you\'d like to install to, run the Fedora Media Writer application, and follow the on-screen prompts to complete installation.')}

+ +

${_('Supported Platforms')}

+

${_('Fedora Media Writer supports the following platforms:')}

+ +
+
+
+

${_('Mac OS X')}

+

${Markup(_('%s MB Fedora Media Writer for <strong>Mac OS X</strong>')) % global_variables.iso_size['macosx']}

+
+
+ ${_('Download')} +
+
+
+
+

${_('Windows')}

+

${Markup(_('%s MB Fedora Media Writer for <strong>Windows</strong>')) % global_variables.iso_size['windows']}

+
+
+ ${_('Download')} +
+
+
+
+

${_('Linux')}

+

${Markup(_('Available via DNF for <strong>Fedora</strong>'))}
+ (${_('More details')})

+
+
+

${Markup(_('64-bit %s GB ISO for <strong>Linux</strong>.')) % global_variables.iso_size['pre_x86_64_workstation']}
+ (${_('How to use this ISO?')})

+ ${_('Download')} +

(${_('Verify this image')})

+
+
+
+
+ +

${_('Verify your Image')}

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

- ${_('Validate 64-bit!')} + ${_('Validate 64-bit!')}
- ${_('Validate 32-bit!')} + ${_('Validate 32-bit!')}
-
+

${_('Other Downloads')}

-

${Markup(_('32-bit %sGB Live image')) % global_variables.iso_size['pre_i386_workstation']}

+

${Markup(_('64-bit %sGB Live image')) % global_variables.iso_size['pre_x86_64_workstation']}

+

${Markup(_('32-bit %sGB Live image')) % global_variables.iso_size['pre_i386_workstation']}

${_('Netinstall Images:')} @@ -82,6 +161,17 @@

  • ${Markup(_('32-bit %sMB image')) % global_variables.iso_size['pre_i386_workstation_net']}

    • + +

    ${_('Resources')}

    +

    ${Markup(_('<a href="%(commonbugs_url)s"><strong>Common Bugs</strong></a>') % {'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}

    +

    ${_('An excellent resource to consult in case you run into any issues installing or running Fedora.')}

    +

    ${Markup(_('<a href="https://fedoraproject.org/wiki/QA/Join#release-validation"><strong>How to test pre-releases</strong></a>'))}

    +

    ${_('Fedora wiki guide on how to help test pre-release versions of Fedora.')}

    + +

    ${_('What does "Live" mean?')}

    +

    ${_('Fedora Media Writer will create a complete, running Fedora Workstation you can run right away off of a USB drive. You can use the Live image to test and play with Fedora without making changes to your hard disk.')}

    +

    ${_('When you are ready, you can install Fedora to your hard disk from within this "live" version of Fedora Workstation.')}

    +
    diff --git a/getfedora.org/data/templates/js.html b/getfedora.org/data/templates/js.html index 73ce730..40cebca 100644 --- a/getfedora.org/data/templates/js.html +++ b/getfedora.org/data/templates/js.html @@ -28,6 +28,14 @@ + + + + + + + +
    @@ -110,11 +109,11 @@

    Jam banner
    ${_('Unleash your inner musician.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Jam']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Jam']}
    @@ -132,11 +131,11 @@

    Robotics Suite banner
    ${_('Dive into Robotics.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Robotics']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Robotics']}
    @@ -154,11 +153,11 @@

    Scientific banner
    ${_('Open source scientific computing.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Sci-kde']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Sci-kde']}
    @@ -176,11 +175,11 @@

    Security Lab banner
    ${_('Thorough, safe and secure.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Security']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Security']}
    @@ -199,10 +198,10 @@

    ${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="../../%s/verify">these instructions</a>.') % (lang))}

    - ${_('Validate 64bit!')} + ${_('Validate 64bit!')}
    - ${_('Validate 32bit!')} + ${_('Validate 32bit!')}
    diff --git a/labs.fedoraproject.org/static/checksums/Fedora-Labs-25-Alpha-1.2-i386-CHECKSUM b/labs.fedoraproject.org/static/checksums/Fedora-Labs-25-Alpha-1.2-i386-CHECKSUM deleted file mode 100644 index 1fb5d06..0000000 --- a/labs.fedoraproject.org/static/checksums/Fedora-Labs-25-Alpha-1.2-i386-CHECKSUM +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-Robotics-Live-i386-25_Alpha-2.iso) = b408a100663d69227d85ba608e52f364132f0bdefe4de0b49cf975c4f4e4c732 -SHA256 (Fedora-Scientific_KDE-Live-i386-25_Alpha-2.iso) = 553cb7828b65fa4c2f1cd8c97674567330c2c8b4d3e77ee8be4ab3289d5d91ba -SHA256 (Fedora-Games-Live-i386-25_Alpha-2.iso) = 356f71d84fe4310f86ee49a09487e4d0d0e5227db089477ddd2b2de3ec2e06ac -SHA256 (Fedora-Design_suite-Live-i386-25_Alpha-2.iso) = 6eaf776b8a410e7eaf3e89b02bab08f6fe206da53a14b26715cc3f0a6d7fd6ec -SHA256 (Fedora-Jam_KDE-Live-i386-25_Alpha-2.iso) = 66e97f7322bdd59f8c56d400dff9c5991c270b48aa867f9c5becd58ccf228900 -SHA256 (Fedora-Security-Live-i386-25_Alpha-2.iso) = 3c1eee730064a695473f862915de95a7dc63a5ade42cefeee7e3ddd6ab56ba08 -SHA256 (Fedora-Astronomy_KDE-Live-i386-25_Alpha-2.iso) = f04c6062b3c3e3c47171059ce25374f5cb705666193d203a8111ffabf94c6bbb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIipAAoJEECJ2PL9sZyYrhMQAJX1pRZ+Z0fEYn+TjRgFdvhs -yGbIRhTjjjLBLlrOIEvonzZI9ul3/aBpS3zyYNDH0ekYtHfLGE0adIUtHhFOyCyH -xR2gWMJWGSvSH4PQ6EzkL+kzqdmC9CPW81RlJJh0Y+Fp3pjnM+1/cEy9Fay+/IDk -zbWVnXLOMGRtT+o34wDvRph4sJiZkZb4xB6zQ33Bire5TW2VcJq4vT+otbPtyKvi -OV4HESDfogdlyvLdKXrzxYr84A6rc88sLKgBsDDBv8FdcnDXq7p91SxxYIb8qMJ7 -pbyQnJfNrwOoHj6NmAttuUsbQtrEE0GWRyX/4nBhJsFrEpfCN9ziRWy7a3cmGtfV -ENWOvUQ55pIHYJ26aSk2ZxXFQebA+hko98rmAdpVgPspAPkJruPgALJL9HtMhu7L -/poG21rT1qdo6kA79KWzwz9b4dGZPAFNG4zNEtngPUGt5bgrjXUtc2un0lU5ScOd -a+vLLKPvToGZLlfJitGbFFWuCIRpjRIEGJw6c5pTHrJQv8oA4KOx2E9aK+X/pRMi -/PI98zYvaN9zFh0Wpr5rg5uUeUgvuv2rhEyMAUdEKculYUhXYGVtfHfUK/m8SqKd -PFqFyCr+nq24EsssF/AJcdzXNkIo0iudppqcUsWpbU8CZGdaTaBL4oiwjgyZK9Et -y5U+Kiel/1RFAXV0MwT8 -=9Dgz ------END PGP SIGNATURE----- diff --git a/labs.fedoraproject.org/static/checksums/Fedora-Labs-25-Alpha-1.2-x86_64-CHECKSUM b/labs.fedoraproject.org/static/checksums/Fedora-Labs-25-Alpha-1.2-x86_64-CHECKSUM deleted file mode 100644 index 2ddbf2c..0000000 --- a/labs.fedoraproject.org/static/checksums/Fedora-Labs-25-Alpha-1.2-x86_64-CHECKSUM +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-Robotics-Live-x86_64-25_Alpha-2.iso) = c5f1ab795d3aeec075b22a40e569b1362d9e57d2041b87755ee5c9ee1fd72f25 -SHA256 (Fedora-Security-Live-x86_64-25_Alpha-2.iso) = cdce2e20f2bc12f66eb382d66b4bc3a2827ddef872d5f23cde5e4fac80c197d2 -SHA256 (Fedora-Scientific_KDE-Live-x86_64-25_Alpha-2.iso) = c5a8abd316b2716b6337f4b457b79b95eab160a58b515b1172f6b60dd21051f8 -SHA256 (Fedora-Jam_KDE-Live-x86_64-25_Alpha-2.iso) = ab8d880e31093234b649b90a694e4b93936ac8b00d305031ea78591e33a432cd -SHA256 (Fedora-Games-Live-x86_64-25_Alpha-2.iso) = 851ba2e664230e22f059fc05cd9cfff173791ba289f03ad7da748f77fee7b5ba -SHA256 (Fedora-Astronomy_KDE-Live-x86_64-25_Alpha-2.iso) = 83ba10655e6db3f34b579d2138a143789e3b6c9a608ced99e58635402295b7f3 -SHA256 (Fedora-Design_suite-Live-x86_64-25_Alpha-2.iso) = 9e1eb9bb445d8eeae65ebaec5c42ac04d15f2cbdce04abd7706579e353dceaa5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIitAAoJEECJ2PL9sZyYtUgP/iQDXi+gpYf2pD4xOsGX+hf/ -NMteyWNA8L1qGvGxix4oF9r/FQJlSTC/ntwk3UUgMFjN9qIOnJ4Zl4iT7f2EzRJ9 -GKV2/Q64frUtOnmuh81ZVu67hdu5/V9gNhob825H6lu70oPTU8W9j06hi9Bb29J8 -dAoDVIicmsjXGv6jJDwWVXF9BlZEu2JYLrHUZflIYd4ck5xwpDiZvvOS+NcawNgs -67BHyAsGmt6CimSbRwkQIcl2/Uh2T2jzO0nR+GzFPfSbHS5UKRgmTYZnb/DbO0WL -Tup9oY+TtBcrel7A2KZ3t1I/hJQenCQbx3clmf1+CBfFMv1Zc5drfiKb/TYYdHpm -yO7jFtz0XPFSHbOcm9dbZ+IhCYl8zYuiTpR8prpkvZLaDAN6CcQ7TU0TubNsBCTy -b7/25jHvQPZvfzTuStv7StTaavcNGJ78vYowOLVnZxJ0zFwb6wlhG5Ev49gKS28Z -MTKMYF3l0OhAKrORrDO1D8Uol4+4TE2lPhVkWPD15p75pgp2YdiGcc1rwJhm/Odc -soqnfT7KSFYaO9RNOEiuY5Bb7UGOykzM1zCeW5TBkb6H5+V/JhAuC1JVKBZ6q3yi -XLHnVjxqesY6Kg81flTs+lTkW7ZY2UPoFD2RXdGV9Eo1rvoPI1qWjHiMaT37Zqhg -zN55RmJP6jhdWQHCBWvp -=Ci5t ------END PGP SIGNATURE----- diff --git a/labs.fedoraproject.org/static/checksums/Fedora-Labs-25_Beta-1.1-i386-CHECKSUM b/labs.fedoraproject.org/static/checksums/Fedora-Labs-25_Beta-1.1-i386-CHECKSUM new file mode 100644 index 0000000..4eccf38 --- /dev/null +++ b/labs.fedoraproject.org/static/checksums/Fedora-Labs-25_Beta-1.1-i386-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Astronomy_KDE-Live-i386-25_Beta-1.1.iso) = 419e4333d888f45732600e6070dc06046f0c2fa2bad190d51bcd8711e9d91b3c +SHA256 (Fedora-Security-Live-i386-25_Beta-1.1.iso) = e5da35456a3004def741ce52c587f3487e67210a297c6ef9312d8dfe6126c2a5 +SHA256 (Fedora-Design_suite-Live-i386-25_Beta-1.1.iso) = df079502a496adfb0a930a6d4260f3feacd5db38b9c990e825bac7d78b80efb6 +SHA256 (Fedora-Jam_KDE-Live-i386-25_Beta-1.1.iso) = ebe0aa23dcfdfe342eebad21470a02f82aad396fcc11b2c0f174ac269c5412de +SHA256 (Fedora-Robotics-Live-i386-25_Beta-1.1.iso) = 2bab114bf13b831b86d34a7ca5ab687f8a5dc00fa2dfaa4eec39da922ab901b2 +SHA256 (Fedora-Scientific_KDE-Live-i386-25_Beta-1.1.iso) = a3fd9767b634cc6607800448d1732ae01a426e216aa48dc8e1314aeca7e8f0cf +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98SQAAoJEECJ2PL9sZyYb20QAJmfnUmjhReKD1PMM7I6yavQ +F0cOm9poZ21R4j4dAwCngFhZFSfaj2LkOTE5KFshPp5ErwQ9UPvKgOHqbstRqGFo +dKsUIiHwd4l5cSMpRtuMjJi6Uq3bCLUQYZhff/WJ0C8CFWVJRhtvJqsihVHmpnV6 +qZW41ZBpwv7aLCDDeSvdTJJwIAWQCV5x0uA3RwvJyjeGx/Yy4o+vwgGCEW2PwzfM +nC4uG7QuUOZ/VhNVZtdlAmlJ5E7QeEmgM2Uowu/ZXrBhq9UcD1XO/nIxtLKhlMkf +0G3rMDTOVo44kZsFQbL5lfNmgdNBuJmdTwEO0tVqXPvWevpT+mQ0HdLA60CHV89J +3QC2QA/UdBkSeUlLH8ETLLVITuPFNqaPYxZotpQFmhWkJsMfdD10alyLH5BqPgJP +ckM92h+sKayUUA9TQkJqICU34rrnvHWHYb7ePgW1tk6XVwv4liXrh6L/yE0bkgWj +0ZPoAT6CJD4F0fRIJQhmrASo+iqiatskI2bfKC7aaU3CCJ4QPFkFnpaUwFAg+xjT +R5pxDlqAl1KTuRcnyN9FFHudRAJP0itbSPJBnNxUvbQAzcYlBmyi/Sbx4tM2a4bU +pYq9jpcj5yisXVni8RtLj8FxSS1kEkGBw6K6maaotLLHqIPQ90l/7wVxl3o4mLKC +S6VxfwUn1Ool3vB6UgE2 +=z3Vn +-----END PGP SIGNATURE----- diff --git a/labs.fedoraproject.org/static/checksums/Fedora-Labs-25_Beta-1.1-x86_64-CHECKSUM b/labs.fedoraproject.org/static/checksums/Fedora-Labs-25_Beta-1.1-x86_64-CHECKSUM new file mode 100644 index 0000000..bac40bc --- /dev/null +++ b/labs.fedoraproject.org/static/checksums/Fedora-Labs-25_Beta-1.1-x86_64-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Jam_KDE-Live-x86_64-25_Beta-1.1.iso) = ed39db212a129770bef32531620f42cc8686d5bc5a8227a2b7eca57315542c4e +SHA256 (Fedora-Security-Live-x86_64-25_Beta-1.1.iso) = 58c30cf4d4f52e7fcaf9fec3debf79686a50e2041b29271dc308724c3ed05b18 +SHA256 (Fedora-Robotics-Live-x86_64-25_Beta-1.1.iso) = 5740b5e3bb3f8cad1999317cb052e2ee66e42f4766b46fb53b0d1cb7b4c29455 +SHA256 (Fedora-Scientific_KDE-Live-x86_64-25_Beta-1.1.iso) = 491a550c5b4425941f3e37577a65a557809d17d08abd720ac516977d4d135377 +SHA256 (Fedora-Astronomy_KDE-Live-x86_64-25_Beta-1.1.iso) = 8ad13f30df38811903f418e9eb957056ac68a198a4e69c43b9fb12823bc93a0d +SHA256 (Fedora-Design_suite-Live-x86_64-25_Beta-1.1.iso) = f545cb59ae435c5adfd22c5f3a235fc392605565b2be7bdfad55d20cccd78868 +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98SUAAoJEECJ2PL9sZyYRxUP/RogUevFtSGEPZu1a69z7lmJ +aj6jsGvb90yhnmcUBt3xP++LpafW/2HIwwSbbU7h+kaFGfsoae0bbLj458f9Exdu +Q9qULtYnbvQpaicoK7IGfu50F0jXS083FgGVlU6EWmUKeYqfVELGabFNYMWXWZRG +lnnR8/OcHGj+RzpeuP8IfdtHxyVqBmD8FbKFCAC/yM4pKdUWpcBd2s7WfpwpbRDQ +ZXMTDud+uLCw1T3R7uRjdc+v+9hyO0YFGca1dXE0Wywr/bJzHMyXabfm9Wl3YkBT +FVSRABkuLUw3Vf+CI3ZN/BTpS+hVecrmc0w9Dr1BkmrC7bADRZVGmx5QIYjvjtjE +UcIrDxnjUWKOE5KWymelRhUwZeIx9MU1V5qZ71TPAKlQNnCgw+sUyPrMeyJKzEwN +p4dvUeqSntW6PGrQWXWRpCg1ouHPSGY2Y7l6v1VMuHhlGtX2CCy5hiUonjHrlzkK +KWv/wOC7P52AdNrb9NxczgERnCO0FLVQuoLJCJ0DkeJ8qFE6lfUL1wE3X9kzS33H +f1hol9ADdBXRt5F4d6z3K5peliYcPFfLobgbblefwKM05jWJ54SWlgdXRW7NJkQk +13Y2FGxYUd0UmELHEQMa8L1t5umgYpx7/iDOcVhBP3BxspiKoom6TquL2x8+txsC +bxItF8ELDBYskyDvwywB +=BD06 +-----END PGP SIGNATURE----- diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html index 4c68d30..d86578f 100644 --- a/spins.fedoraproject.org/data/content/prerelease.html +++ b/spins.fedoraproject.org/data/content/prerelease.html @@ -46,11 +46,11 @@

    KDE banner
    ${_('A complete, modern desktop built using the KDE Plasma Desktop.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_KDE']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_KDE']}
    @@ -68,11 +68,11 @@

    Xfce banner
    ${_('A complete, well-integrated Xfce Desktop.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Xfce']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Xfce']}
    @@ -90,11 +90,11 @@

    LXDE banner
    ${_('A light, fast, less-resource hungry desktop environment.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_LXDE']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXDE']}
    @@ -112,11 +112,11 @@

    MATE-Compiz banner
    ${_('A classic Fedora Desktop. With wobbly Windows.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Mate']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Mate']}
    @@ -134,11 +134,11 @@

    Cinnamon banner
    ${_('Traditional layout, advanced features, easy to use.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Cinnamon']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s GB ISO Image')) % global_variables.iso_size['pre_i686_Live_Cinnamon']}
    @@ -156,11 +156,11 @@

    SoaS banner
    ${_('Discover. Reflect. Share. Learn.')}

    - 64-bit image + 64-bit image
    ${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Soas']}
    - 32-bit image + 32-bit image
    ${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_Soas']}
    @@ -179,10 +179,10 @@

    ${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="../../%s/verify">these instructions</a>.') % (lang))}

    - ${_('Validate 64bit!')} + ${_('Validate 64bit!')}
    - ${_('Validate 32bit!')} + ${_('Validate 32bit!')}
    diff --git a/spins.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-i386-CHECKSUM b/spins.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-i386-CHECKSUM deleted file mode 100644 index 8397e83..0000000 --- a/spins.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-i386-CHECKSUM +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-SoaS-Live-i386-25_Alpha-2.iso) = 5ee2bd89b7ac039907c7ba4f65c4fa51627c5098633a11df4eaab824bf4a415b -SHA256 (Fedora-KDE-Live-i386-25_Alpha-2.iso) = 458db5904efe03391c787f11e4f2ff08545fe664f232d1d8e97a82d0bd8817e5 -SHA256 (Fedora-Cinnamon-Live-i386-25_Alpha-2.iso) = 9985801406b6f6c6b101bda07d667f795a1bfff038c4f82795f13af99f9e4278 -SHA256 (Fedora-Xfce-Live-i386-25_Alpha-2.iso) = bbb9c9807e7be455ebf1bebc5d6bbd39652b4d23d8a24d4a279925a832b70667 -SHA256 (Fedora-MATE_Compiz-Live-i386-25_Alpha-2.iso) = d869b9997204e7493c903d92f153467f33339b4632b67fee3007011e61a0b35f -SHA256 (Fedora-LXDE-Live-i386-25_Alpha-2.iso) = 5d61ceb977c3b9a838e90734bb31a6ffeada108ddc94ca8b12cedbf337a8c853 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIh8AAoJEECJ2PL9sZyY7wYP/1Tp7cnBe9DEnZrvbWp7ngQU -dAlAVULmUiGw+mcpBEco7JV2Sa6OmBYP2ombezK+BI27Cved1wstWcU2aL+Q+4ZM -y5+iH2JNIXakWu2XyNqOujjh1JKhILypZbaQw0QXB9wNYfeJ2nYLqZFRzfgCDWXN -Ow869BRbSUgA1rXjTrNtGfi4P6oEJYQP4DKPUEAdVrMwDT6QIlsAz1X6ZtGSqbPO -xirR7kBMtKKoXkDJJs3Lt8ILbbGVH7xUYi/cdQrxMmSG2Ikz1luz7cDyfuKFyxyL -C+k8jqy4fhd8Y3FzEVgNnOD4zZldJLUP64jvgtj9sbMY5gXs1WnVMbDGgebVyNAH -/AcNbIB7Px9swkYWG3XZ/jHBp4Akh+AaIQ+ypJqrPdzjxkYuiIuzz5wccmLEKbkx -lksy6huqGZ+VPl/D6FMWYWFBIIBiEfHazKjrLAW5VSVnnF5ezyaLYDKbGiwP7FDk -geG2YfAJ2O3Xtqp2Tm+kgAL47YZ4MeopTMr6nz+E+6QZ5U3WRrg4JyFgie3CJJMU -r8vLg3/XaHUSyBzXiE2r9lYdx0NTyYMv5ChU8fvkDVGenLTj7zToFIFtoxPUaQx8 -FJ1zM5X9qDZ2SCw9RsyD1rz1YbAyhm0bXVshUmHblrpSiVphlqPI71yfxvTeEmQ1 -viONAz5UW8tkdKJt+NE7 -=8qrk ------END PGP SIGNATURE----- diff --git a/spins.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-x86_64-CHECKSUM b/spins.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-x86_64-CHECKSUM deleted file mode 100644 index 1835894..0000000 --- a/spins.fedoraproject.org/static/checksums/Fedora-Spins-25-Alpha-1.2-x86_64-CHECKSUM +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (Fedora-Xfce-Live-x86_64-25_Alpha-2.iso) = a33e211d3f82462e898e26aded0cff953873243722ebd2464698ea3e7e65781f -SHA256 (Fedora-KDE-Live-x86_64-25_Alpha-2.iso) = 85ffeb44c3c909f3eca5b34e61b8f38ba90fd2cceb8d47102e41e4a89b540c00 -SHA256 (Fedora-SoaS-Live-x86_64-25_Alpha-2.iso) = 3b95a5ae995ef4a3581981cbad5f222500b884fc134e4eab4080967fc774cd7e -SHA256 (Fedora-Cinnamon-Live-x86_64-25_Alpha-2.iso) = 6ae137e4cdee9ce48d5ca791e375873e9ab77b4b1b208e401fb29965d9345d6e -SHA256 (Fedora-LXDE-Live-x86_64-25_Alpha-2.iso) = 5e46a393a6b756a650d7877dfd09e32c6d7157dc85ba0217cfe9d7f15e2d11fe -SHA256 (Fedora-MATE_Compiz-Live-x86_64-25_Alpha-2.iso) = 6d58fd53992bf2815817af63d78240217018bb76aa20bd3d01dd86ae3368b2cd ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCAAGBQJXwIiAAAoJEECJ2PL9sZyYXk8P+wa2D53/6glrd9Va8RuvUu7x -tCKY+Sg+6W2O8FwgWWC/B3GHWirtcu70Kli+eYkuotAGt3o4NlevC3kv+jGlzjjT -CYGllNbn5BpvZNY/wfVmAhNA4eKyZnEtMZxdffT91Hd3qGuf6ozFBfOTNjDp2+ab -wWNcSaKAuyjdRBNMxG2eeXtaD6BRcQm7E45NpFha76NLSyPrMS7zyLe3b7Ll0/xA -917tuW+l7aDMbsehPo5aM4bHJVTb6l18ByFWHWoP8gOP2xnzc1uBacRZa5LestVr -W3qeJN31/MaUNhppZfJTioYMYCalBiTXwCVZNxRRnJp78rcGZ6/vzzGAQ1lDvKGA -9gSl5aT4x6lqX8AlJ/+j75Qa+LlGCX0Ehj4ae49kqqbMYaCWI2rz+lrvSC4jTMmS -/dNp/FhVAoBCnWwGK2zjqxAe+Fug4MlaOdbqVAPL96khiXxk5LMMYJkAcY21oF1d -+Uga+KA19s7Gs0q+ltgXetX/O0B4l1SP+JQsY4wRk97zl9fwFDRipM8FG516gc6C -7IKxOzDMCcOBQxAmi01iWrRZyeUvbbyPk+xdAUzkGCw3Vjn3NjhJXE7Hii1ieHvT -pDh3EDWlGBb61GMFJFX2qxjQDoS3eR3oKEPomlgfEiQ8TXLsxGgVW3yCrAD3q125 -dZdfhajvc3QtyIdVp4/+ -=PMZC ------END PGP SIGNATURE----- diff --git a/spins.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-i386-CHECKSUM b/spins.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-i386-CHECKSUM new file mode 100644 index 0000000..1a761a2 --- /dev/null +++ b/spins.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-i386-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-Cinnamon-Live-i386-25_Beta-1.1.iso) = 929c790bb21465feaa4d31e205e0375124fa5f07b6ba72be99892faa534a413f +SHA256 (Fedora-MATE_Compiz-Live-i386-25_Beta-1.1.iso) = 3adbb728b92a80dcfaf2c2243186553c1710ba6641acdc0aca4eb026db9832b7 +SHA256 (Fedora-Xfce-Live-i386-25_Beta-1.1.iso) = 6bc1c83d72d864f4843d112792ca08cedc3966d9fa486c415f12bca4642f97e9 +SHA256 (Fedora-SoaS-Live-i386-25_Beta-1.1.iso) = d8f42b9178754e0f38f68415767f9635930cbe2e6ea09f7be6ebbf1a5d4d5901 +SHA256 (Fedora-KDE-Live-i386-25_Beta-1.1.iso) = c970e5971118592db09bd85ec8ca189447af8ec3cda72186affb3777f10a327b +SHA256 (Fedora-LXDE-Live-i386-25_Beta-1.1.iso) = f166c833d0aa241e26d741cb689adc47e927b025456d22d3c35db66b28ac413a +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98RwAAoJEECJ2PL9sZyY1xoP/3VQAfF9V/lNrHTSVzpl9vA4 +sAK41sVNcKPdJuFYIM7Cf0Dox6qyQJuLyeiVcbeiLCM9QEVktVSvoMVmDSoM0Wc9 +5lPCfmBKbK9pj61y4KHeHhUky7IChYdOinkt0wA11QzetaGz42LqiZg4nv8YtaRE +fuhYRYK/yhlgDAW+slPxnKLYF3yG8BXHy9DgqqmIyz2mSJbwf8HL4wcIXVMnktPK +k0NlIhYb1SsxPGpudbmsyl3E6J9iE7IeAVOP8aPX7lDVmReZsDgr4hQiMRs2IgjR +KJq1VdkelEU1YvgFvoucB4UHpXeI5dNKsxOP75qnnbCJf5xwyfS0OCtdP71/fga4 +Zo+F/ROcFutqemgwwWNFQhBdV0AVGK0uTvYS3wOtREBPFyfcF0znSjk6iMQEOfeY +jnscyCnSiiRUE6NTYTM9xvCxp0nC9/WJIwrqkupXtib2F+rGdhOZNRcC5RVmJfIa +Y0TAtmncJLAItasZ5U2xAdVuWBVUHflo3XZI27LVwutFQheYqn8B60okUo1Yife5 +4K8r4f/a+sgYKXzfo8KWDNuSbYT5i3kcLwTBlcVXnoe+eIIId6IdTUTa0N6PbelZ +Y8U+kJXt08kd3jYAEYLUaEZA1nn9vlI29WCY2rQF17dBeivnLfhSJRgxYXuCK1vm ++rHpcgzXMqkMpLdrSTmG +=lS/D +-----END PGP SIGNATURE----- diff --git a/spins.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-x86_64-CHECKSUM b/spins.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-x86_64-CHECKSUM new file mode 100644 index 0000000..05f6814 --- /dev/null +++ b/spins.fedoraproject.org/static/checksums/Fedora-Spins-25_Beta-1.1-x86_64-CHECKSUM @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (Fedora-MATE_Compiz-Live-x86_64-25_Beta-1.1.iso) = 493d84d4e84a4bd89142f9f331dce303f115b9b732f045fc1b914c11f67d13a5 +SHA256 (Fedora-KDE-Live-x86_64-25_Beta-1.1.iso) = f63c914d6a4e3bb5009316356df0384dd4c3721d5b7d8e756a390e75b701dfb9 +SHA256 (Fedora-SoaS-Live-x86_64-25_Beta-1.1.iso) = a8ef50429c3c25f18891d0a74765736e663acd9814cc2f57b4788eecc372270b +SHA256 (Fedora-Cinnamon-Live-x86_64-25_Beta-1.1.iso) = bdb165522b801e02ca9910e73295a8824054349ee3c2cefb777109b1b5ea9b2d +SHA256 (Fedora-LXDE-Live-x86_64-25_Beta-1.1.iso) = 0cc0720502df632f122c3cfa067da8d27e2342ca07782b47daacb482698010ef +SHA256 (Fedora-Xfce-Live-x86_64-25_Beta-1.1.iso) = 572620f9be39970950d395c5265eae3dbe8e169e440c4e7b203447f46b96da3f +-----BEGIN PGP SIGNATURE----- + +iQIcBAEBCAAGBQJX98R2AAoJEECJ2PL9sZyYzXwP/2mN9eNCk5wH0g4hO4RrUdtb +gDcz1PSfnrhFaUPw/zFVLFaieS54DlPsILCPY57Y4g5JntN2mAsBOydRarXSmvrm +QlWLIb4Xep288zk6lTIOJ50GkNikhVl3FHDQuon0TpYnYi52qoxp3nRHyOwPquzx +5FA2gpJZq1byecOKgBicG7sZyiFgiCOCLKJBQtnVjr6l6woz5i6y3i/6Q8IXXDF8 +WVg5cfMQ6HPV3CetvcEu9wJoNRIj9UNWCw7jvdkZeopKmE53SLOXQI3OsbOF6JpR +q0wFsztuJ034PGgH6fHl0dpLxXVjwi7Vii8maqvLM1tKnnXx2Fd4kqsVbIVdrm2b +vz5QK7mt/3y8zkxzb5nBs2gctDsN5WnNEM7Vvxo/I9Lhh43bbZemiNWLiAbxs774 +0JJT4oGh8tBnCIDFxdz7cDJLo/DcknGclclfvCTFIUuyoQ2cQUmh4+qhADnHzMeW +BP4qEh80oGeWwZ06pEimSPOG9K6VYcMld7dtfFzn+fCqrtyqukOt82JBMw10pp2q +eZWAY2iyjIZjDGVqt+H8MeS7BNjKIGCGHZxa8eiieAPR47qgMQ5czWd+PPaWJrRU +CDe3HXmIT/NjjO1MFHqOGKZr9PoAKTlUAhutrVpXbYhKtK3ajVGJjDpkSA8u6GM6 +PBEGYYwIu5un2D6OzsfE +=4kQf +-----END PGP SIGNATURE-----