From a517eb4876ebc8a6f3ca7247da20ac7039c9e1a7 Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Apr 22 2021 14:40:12 +0000 Subject: [PATCH 1/27] Add i3 to the Spins page --- diff --git a/spins.fedoraproject.org/data/content/index.html b/spins.fedoraproject.org/data/content/index.html index bafccd6..0ef7d01 100644 --- a/spins.fedoraproject.org/data/content/index.html +++ b/spins.fedoraproject.org/data/content/index.html @@ -149,6 +149,20 @@ + +
+
+
+ i3 Screenshot +
+
+
+
+

i3 banner
+ ${_('Tiling window manager.')}

+
+
+
From a234f87263535c6d7fd12c5704a4a642cb6411ad Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Apr 22 2021 15:52:05 +0000 Subject: [PATCH 2/27] KDE Spin: Update for F34 showcased software --- diff --git a/spins.fedoraproject.org/data/content/kde/index.html b/spins.fedoraproject.org/data/content/kde/index.html index 4d981b4..5d37d8a 100644 --- a/spins.fedoraproject.org/data/content/kde/index.html +++ b/spins.fedoraproject.org/data/content/kde/index.html @@ -89,9 +89,9 @@

${Markup(_('Office & Productivity Suite'))}

- Calligra -

${_('Calligra')}

-

${_('Calligra is an integrated office suite built on KDE Platform. It utilizes free and open standards like OpenDocument for its document formats and components.')}

+ LibreOffice +

${_('LibreOffice')}

+

${_('LibreOffice is a free and powerful office suite. Its clean interface and feature-rich tools help you unleash your creativity and enhance your productivity.')}

Okular @@ -111,17 +111,22 @@
-
+
+ Elisa +

${_('Elisa')}

+

${_('A simple music player that should be easy to use. It does not require any configuration before one can use it.')}

+
+
Dragon Player

${_('Dragon Player')}

${_('A multimedia player where the focus is on simplicity, instead of features. Its simple interface is designed not to get in your way and instead empower you to simply play multimedia files.')}

-
+
K3B

${_('K3B')}

${_('K3B allows you to easily back up your multimedia files as it\'s a full featured CD/DVD writing software. K3B supports writing data CDs/DVDs, audio CDs, video CDs, DVDs, copying, CD ripping and more.')}

-
+
Gwenview

${_('Gwenview')}

${_('Gwenview is able to load and save to a variety of image formats, such as PNG and JPEG. Its simple interface does not get in the way and lets you view your images quickly and easily.')}

diff --git a/spins.fedoraproject.org/static/images/kde/calligra.png b/spins.fedoraproject.org/static/images/kde/calligra.png deleted file mode 100644 index 545ecda..0000000 Binary files a/spins.fedoraproject.org/static/images/kde/calligra.png and /dev/null differ diff --git a/spins.fedoraproject.org/static/images/kde/elisa.png b/spins.fedoraproject.org/static/images/kde/elisa.png new file mode 100644 index 0000000..030e229 Binary files /dev/null and b/spins.fedoraproject.org/static/images/kde/elisa.png differ diff --git a/spins.fedoraproject.org/static/images/kde/libreoffice.png b/spins.fedoraproject.org/static/images/kde/libreoffice.png new file mode 100644 index 0000000..87eb026 Binary files /dev/null and b/spins.fedoraproject.org/static/images/kde/libreoffice.png differ From dee99efa16b8f0f30b0ad43151323fde831ed5d6 Mon Sep 17 00:00:00 2001 From: Brandon Nielsen Date: Apr 23 2021 23:45:14 +0000 Subject: [PATCH 3/27] Update setup instructions to note python2-genshi is required. --- diff --git a/README.md b/README.md index 710c09f..250aa45 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ This repository contains the sources for the following Fedora Websites: #### 1. Setup your system - sudo dnf install git gettext python-genshi python-lxml python-setuptools python-dateutil \ + sudo dnf install git gettext python2-genshi python-lxml python-setuptools python-dateutil \ python-dogpile-cache babel python-feedparser fedfind python-requests python2-babel sudo dnf groups install 'Web Server' From 4a594a07dc4e6b13c5956286f8e454547898cf54 Mon Sep 17 00:00:00 2001 From: Brandon Nielsen Date: Apr 24 2021 14:45:22 +0000 Subject: [PATCH 4/27] Improve some wording. --- diff --git a/arm.fedoraproject.org/data/content/index.html b/arm.fedoraproject.org/data/content/index.html index 7379642..44ceff0 100644 --- a/arm.fedoraproject.org/data/content/index.html +++ b/arm.fedoraproject.org/data/content/index.html @@ -472,7 +472,7 @@
-

${_('These images are for ARM-based devices where a bundle of purpose-drive software is needed.')}

+

${_('These images are for ARM-based devices where a bundle of purpose-driven software is needed.')}

@@ -504,7 +504,7 @@
-

${_('These images are for ARM-based devices where a bundle of purpose-drive software is needed.')}

+

${_('These images are for ARM-based devices where a bundle of purpose-driven software is needed.')}

@@ -531,7 +531,7 @@
-

${_('These images are for ARM-based devices where a bundle of purpose-drive software is needed.')}

+

${_('These images are for ARM-based devices where a bundle of purpose-driven software is needed.')}

@@ -557,7 +557,7 @@

${Markup(_('What is ARM<span class="sup">®</span> Technology?'))}

${_('ARM microprocessors are the most widely-produced processor family in the world; they have historically been used in cell phones and embedded applications, and are increasingly used in tablet devices and low-power-consumption servers.')}

-

${_('The Fedora ARM project is an initiative to bring Fedora to this processor family. The images provided here are versions of Fedora tailored for running in on ARM-based systems.')}

+

${_('The Fedora ARM project is an initiative to bring Fedora to this processor family. The images provided here are versions of Fedora tailored for running on ARM-based systems.')}

From eb1b9206ff8bac76e00fdff4c2c1f2626a94b717 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Apr 26 2021 18:31:06 +0000 Subject: [PATCH 5/27] Update the KDE Plasma screenshot for F34 --- diff --git a/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg b/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg index 20f8b00..6dd5c95 100644 Binary files a/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg and b/spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg differ From 2e7f534e87fec9f72a443bc8381574eb909dfe2a Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Apr 26 2021 18:55:34 +0000 Subject: [PATCH 6/27] Revert "[alt] hardcode some changes for arm links" This reverts commit 1dace0b7c9b5d260a2bd5199b5ae67aaa8e8623d. --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 649e996..6112f9f 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -43,7 +43,7 @@

${Markup(_('%sGB dvd iso')) % global_variables.iso_size['aarch64_Server_DVD']}

-

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

+

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

@@ -57,7 +57,7 @@

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Server_net']}

-

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

+

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

@@ -71,7 +71,7 @@

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

-

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

+

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

@@ -85,7 +85,7 @@

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

-

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

+

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

@@ -99,7 +99,7 @@

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_ev']}

-

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

+

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

@@ -183,7 +183,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -192,7 +192,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -201,7 +201,7 @@

${_('Fedora Workstation')}

-

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

+

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

@@ -210,7 +210,7 @@

${_('Fedora Minimal')}

-

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

+

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

@@ -219,7 +219,7 @@

${_('Everything')}

-

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

+

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

@@ -284,7 +284,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -295,7 +295,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -306,7 +306,7 @@

${_('Fedora Workstation')}

-

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

+

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

@@ -317,7 +317,7 @@

${_('Fedora Minimal')}

-

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

+

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

@@ -328,7 +328,7 @@

${_('Everything')}

-

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

+

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

diff --git a/alt.fedoraproject.org/data/content/verify.html b/alt.fedoraproject.org/data/content/verify.html index 8938e5d..1ef3085 100644 --- a/alt.fedoraproject.org/data/content/verify.html +++ b/alt.fedoraproject.org/data/content/verify.html @@ -47,10 +47,10 @@

${_('Server')}

- ${_('aarch64 Minimal')} + ${_('aarch64 Minimal')}
- ${_('For aarch64')} + ${_('For aarch64')}
${_('For ppc64le')} From 347d65ec57f7f19c5ac754a7c8166e1bda34c01b Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Apr 26 2021 18:55:34 +0000 Subject: [PATCH 7/27] bump globalvar Signed-off-by: Rick Elrod --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index dafba6d..2bfee50 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -2,37 +2,37 @@ # -*- coding: utf-8 -*- # This file defines all variable needed to be edited during the release cycle (alpha, beta...). release={ - 'prev_id': '32', - 'curr_id': '33', - 'next_id': '34', + 'prev_id': '33', + 'curr_id': '34', + 'next_id': '35', 'curr_name': '', 'next_name': '', - 'curr_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_arm_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) - 'curr_alt_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) - 'curr_server_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_arm_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_alt_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_cloud_AMI_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_server_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_atomic_state': '', # 'Pre-Release' or '' - No Alpha/Beta for Atomic Host - 'prev_arm_id': '32', - 'prev_alt_id': '32', - 'prev_cloud_id': '32', + 'prev_arm_id': '33', + 'prev_alt_id': '33', + 'prev_cloud_id': '33', 'prev_atomic_id': '30', - 'curr_arm_id': '33', - 'curr_alt_id': '33', - 'curr_cloud_id': '33', + 'curr_arm_id': '34', + 'curr_alt_id': '34', + 'curr_cloud_id': '34', 'curr_atomic_id': '30', - 'curr_server_id': '33', - 'curr_cloud_AMI_id': '33', - 'curr_iot_id': '33', - 'curr_silverblue_id': '33', - 'next_silverblue_id': '34', - 'next_arm_id': '34', - 'next_alt_id': '34', - 'next_cloud_id': '34', + 'curr_server_id': '34', + 'curr_cloud_AMI_id': '34', + 'curr_iot_id': '34', + 'curr_silverblue_id': '34', + 'next_silverblue_id': '35', + 'next_arm_id': '35', + 'next_alt_id': '35', + 'next_cloud_id': '35', 'next_atomic_id': '30', - 'next_server_id': '34', - 'next_cloud_AMI_id': '34', + 'next_server_id': '35', + 'next_cloud_AMI_id': '35', 'composedate': '20160616', 'unofficial_compose': '20181029', 'alt_composedate': '20161118', From 6eb5f2503d235f9dfaad246d1402eadddea172ae Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Apr 26 2021 18:55:34 +0000 Subject: [PATCH 8/27] [alt] Fix up checksum links, and point them to new getfedora checksum dir format Signed-off-by: Rick Elrod --- diff --git a/alt.fedoraproject.org/data/content/verify.html b/alt.fedoraproject.org/data/content/verify.html index 1ef3085..e33d7d0 100644 --- a/alt.fedoraproject.org/data/content/verify.html +++ b/alt.fedoraproject.org/data/content/verify.html @@ -38,7 +38,8 @@

${_('Workstation')}

- ${_('For aarch64')} + ${_('For aarch64 iso')} + ${_('For aarch64 images')}
@@ -47,16 +48,17 @@

${_('Server')}

- ${_('aarch64 Minimal')} + ${_('aarch64 Minimal')}
- ${_('For aarch64')} + ${_('For aarch64 iso')} + ${_('For aarch64 images')}
- ${_('For ppc64le')} + ${_('For ppc64le')}
- ${_('For s390x')} + ${_('For s390x')}
@@ -65,19 +67,16 @@

${_('Cloud')}

- ${_('For aarch64 iso')} + ${_('For aarch64 images')}
- ${_('For aarch64 images')} + ${_('For ppc64le images')}
- ${_('For ppc64le images')} + ${_('For s390x images')}
- ${_('For s390x images')} -
-
- ${_('For Cloud Base images')} + ${_('For x86_64 images')}
@@ -86,13 +85,13 @@

${_('Container')}

- ${_('For aarch64')} + ${_('For aarch64')}
- ${_('For ppc64le')} + ${_('For ppc64le')}
- ${_('For s390x')} + ${_('For s390x')}
@@ -106,9 +105,9 @@ 
$ gpg --verify-files *-CHECKSUM

${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}

${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}

diff --git a/alt.fedoraproject.org/data/templates/generic/splash-checksum.html b/alt.fedoraproject.org/data/templates/generic/splash-checksum.html index 8b99f5c..046d67c 100644 --- a/alt.fedoraproject.org/data/templates/generic/splash-checksum.html +++ b/alt.fedoraproject.org/data/templates/generic/splash-checksum.html @@ -7,13 +7,4 @@

${Markup(_('Verify your Download!'))}

${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))}

-
-
- ${_('Verify 64bit!')} -
-
- ${_('Verify 32bit!')} -
-
- From 4879eb83956afa38270f7d8701c4ac3c61d6fe17 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Apr 26 2021 18:55:34 +0000 Subject: [PATCH 9/27] [arm] checksum fixes Signed-off-by: Rick Elrod --- diff --git a/arm.fedoraproject.org/data/content/verify.html b/arm.fedoraproject.org/data/content/verify.html index c0ca015..ea27a9d 100644 --- a/arm.fedoraproject.org/data/content/verify.html +++ b/arm.fedoraproject.org/data/content/verify.html @@ -35,25 +35,26 @@

${_('Server')}

- ${_('Verify Server!')} + ${_('Verify Server iso')} + ${_('Verify Server images')}
- ${_('Verify Minimal!')} + ${_('Verify Minimal')}

${_('Desktop')}

- ${_('Verify Workstation!')} + ${_('Verify Workstation images')}
- ${_('Verify Spins!')} + ${_('Verify Spins images')}

${_('Labs')}

- ${_('Verify Labs!')} + ${_('Verify Labs images')}
@@ -67,9 +68,9 @@ 
$ gpg --verify-files *-CHECKSUM

${Markup(_('The CHECKSUM file should have a good signature from one of the following keys:'))}

    +
  • 45719A39 - ${_('Fedora 34')}
    • +
  • 9570FF31 - ${_('Fedora 33')}
  • 12C944D0 - ${_('Fedora 32')}
    • -
  • 3C3359C4 - ${_('Fedora 31')}
    • -
  • CFC659B9 - ${_('Fedora 30')}
  • DBBDCF7C - ${_('IOT 2019')}

${Markup(_('Finally, now that the CHECKSUM file has been verified, check that the image\'s checksum matches:'))}

From 906810bfd843ce8c85b211a4434dca1f7f12b36a Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Apr 26 2021 18:55:34 +0000 Subject: [PATCH 10/27] [arm] reindent index to make editing it feasible Signed-off-by: Rick Elrod --- diff --git a/arm.fedoraproject.org/data/content/index.html b/arm.fedoraproject.org/data/content/index.html index 7379642..9d4010a 100644 --- a/arm.fedoraproject.org/data/content/index.html +++ b/arm.fedoraproject.org/data/content/index.html @@ -1,598 +1,598 @@ + xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> ${_('Fedora ARM')} - - + + - - - -
-
-
-
-

${Markup(_('<strong>Fedora %(rel)s %(state)s</strong> released! <a href="%(link)s">Test it now ></a>')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}

+ + + +
+
+
+
+

${Markup(_('<strong>Fedora %(rel)s %(state)s</strong> released! <a href="%(link)s">Test it now ></a>')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}

+
-
- - -
-
-
-
-

${Markup(_('<strong>Fedora %(rel)s %(state)s</strong> released! <a href="%(link)s">Test it now ></a>')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}

+ + +
+
+
+
+

${Markup(_('<strong>Fedora %(rel)s %(state)s</strong> released! <a href="%(link)s">Test it now ></a>')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}

+
-
- - -
-
-
-
-

${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}

+ + +
+
+
+
+

${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}

+
-
- - + + - -