From ca2f43d720bef2a69d2425f3072b2054fc2eed43 Mon Sep 17 00:00:00 2001
From: taoky <me@taoky.moe>
Date: Mon, 4 Nov 2024 20:10:04 +0800
Subject: [PATCH] fedora: port changes

https://github.com/mirrorz-org/mirrorz-help/commit/0b1405bde45b463a96cdad25e1309b17388dea51

Note that -debug and -source are not included in manual replacement part.
---
 fedora/cover.zh.md |  4 ++--
 fedora/usage.zh.md | 45 +++++++++++----------------------------------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/fedora/cover.zh.md b/fedora/cover.zh.md
index c739f4a..79b8f47 100644
--- a/fedora/cover.zh.md
+++ b/fedora/cover.zh.md
@@ -1,5 +1,5 @@
 ## 收录范围
 
-Fedora 29 及更旧版本已不再受官方支持，Fedora 官方已将 Fedora 29 及更旧版本的软件仓库从主镜像中移除，并转移至了 archive 镜像中。
+Fedora 38 及更旧版本已不再受官方支持，Fedora 官方已将 Fedora 38 及更旧版本的软件仓库从主镜像中移除，并转移至了 archive 镜像中。
 
-故 Fedora 29 及更旧版本无法使用所选择的镜像。请使用默认配置文件，以使 `yum` / `dnf` 自动获取可用的镜像源。
+故 Fedora 38 及更旧版本无法使用所选择的镜像。请使用默认配置文件，以使 `yum` / `dnf` 自动获取可用的镜像源。
diff --git a/fedora/usage.zh.md b/fedora/usage.zh.md
index 2b78c6e..a1581ca 100644
--- a/fedora/usage.zh.md
+++ b/fedora/usage.zh.md
@@ -20,9 +20,7 @@ Fedora 的软件源配置文件可以有多个，其中：
     -e 's|^#baseurl=http://download.example/pub/fedora/linux|baseurl={{endpoint}}|g' \
     -i.bak \
     /etc/yum.repos.d/fedora.repo \
-    /etc/yum.repos.d/fedora-modular.repo \
-    /etc/yum.repos.d/fedora-updates.repo \
-    /etc/yum.repos.d/fedora-updates-modular.repo
+    /etc/yum.repos.d/fedora-updates.repo
 </tmpl>
 
 ### 手动替换
@@ -32,9 +30,13 @@ Fedora 的软件源配置文件可以有多个，其中：
 <tmpl z-lang="ini">
 [fedora]
 name=Fedora $releasever - $basearch
-failovermethod=priority
 baseurl={{endpoint}}/releases/$releasever/Everything/$basearch/os/
-metadata_expire=28d
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
@@ -45,37 +47,12 @@ skip_if_unavailable=False
 <tmpl z-lang="ini">
 [updates]
 name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
 baseurl={{endpoint}}/updates/$releasever/Everything/$basearch/
+#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-</tmpl>
-
-**`fedora-modular` 仓库 (/etc/yum.repos.d/fedora-modular.repo)**
-
-<tmpl z-lang="ini">
-[fedora-modular]
-name=Fedora Modular $releasever - $basearch
-failovermethod=priority
-baseurl={{endpoint}}/releases/$releasever/Modular/$basearch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-</tmpl>
-
-**`updates-modular` 仓库 (/etc/yum.repos.d/fedora-updates-modular.repo)**
-
-<tmpl z-lang="ini">
-[updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-failovermethod=priority
-baseurl={{endpoint}}/updates/$releasever/Modular/$basearch/
-enabled=1
+countme=1
+repo_gpgcheck=0
+type=rpm
 gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch