From c9e61cba0e07a6807722c41bf9635eb10ace676a Mon Sep 17 00:00:00 2001
From: lea <lleyton@fyralabs.com>
Date: Tue, 17 Dec 2024 19:13:06 -0800
Subject: [PATCH] prepare repos for release

---
 .../base/repodir/fedora-updates-testing.repo    |  4 ++--
 .../base/repodir/rpmfusion-free-tainted.repo    | 13 ++++++-------
 .../base/repodir/rpmfusion-free-updates.repo    | 17 ++++++++---------
 katsu/modules/base/repodir/rpmfusion-free.repo  | 14 ++++++--------
 .../base/repodir/rpmfusion-nonfree-tainted.repo | 13 ++++++-------
 .../base/repodir/rpmfusion-nonfree-updates.repo | 17 ++++++++---------
 .../modules/base/repodir/rpmfusion-nonfree.repo | 14 ++++++--------
 7 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/katsu/modules/base/repodir/fedora-updates-testing.repo b/katsu/modules/base/repodir/fedora-updates-testing.repo
index 837355c..fe6e9b6 100644
--- a/katsu/modules/base/repodir/fedora-updates-testing.repo
+++ b/katsu/modules/base/repodir/fedora-updates-testing.repo
@@ -2,8 +2,8 @@
 name=Fedora $releasever - $basearch - Test Updates
 #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=1
-countme=1
+enabled=0
+countme=0
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
diff --git a/katsu/modules/base/repodir/rpmfusion-free-tainted.repo b/katsu/modules/base/repodir/rpmfusion-free-tainted.repo
index c497377..79bf7e3 100644
--- a/katsu/modules/base/repodir/rpmfusion-free-tainted.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free-tainted.repo
@@ -1,8 +1,7 @@
-# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-free-tainted]
 name=RPM Fusion for Fedora $releasever - Free tainted
-baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
 enabled=1
 metadata_expire=6h
 type=rpm-md
@@ -12,8 +11,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-tainted-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free tainted - Debug
-baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=6h
 type=rpm-md
@@ -23,8 +22,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-tainted-source]
 name=RPM Fusion for Fedora $releasever - Free tainted - Source
-baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=6h
 type=rpm-md
diff --git a/katsu/modules/base/repodir/rpmfusion-free-updates.repo b/katsu/modules/base/repodir/rpmfusion-free-updates.repo
index 419c21c..6c94232 100644
--- a/katsu/modules/base/repodir/rpmfusion-free-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free-updates.repo
@@ -1,10 +1,9 @@
-# TODO: We're bypassing their mirrors because they're broken
 [rpmfusion-free-updates]
 name=RPM Fusion for Fedora $releasever - Free - Updates
-baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
-enabled=0
-enabled_metadata=0
+# baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
@@ -12,8 +11,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Updates Debug
-baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
@@ -22,8 +21,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-source]
 name=RPM Fusion for Fedora $releasever - Free - Updates Source
-baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
diff --git a/katsu/modules/base/repodir/rpmfusion-free.repo b/katsu/modules/base/repodir/rpmfusion-free.repo
index ee002c3..7df92ce 100644
--- a/katsu/modules/base/repodir/rpmfusion-free.repo
+++ b/katsu/modules/base/repodir/rpmfusion-free.repo
@@ -1,9 +1,7 @@
-# TODO: We're bypassing their mirrors because they're broken atm
-# you'll also want to change "development" in the baseurl link to "releases" once Fedora 41 is released
 [rpmfusion-free]
 name=RPM Fusion for Fedora $releasever - Free
-baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
 enabled=1
 metadata_expire=14d
 type=rpm-md
@@ -13,8 +11,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Debug
-baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/debug/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -24,8 +22,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-source]
 name=RPM Fusion for Fedora $releasever - Free - Source
-baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/source/SRPMS/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo b/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo
index 2b7c7c6..04fd673 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo
@@ -1,8 +1,7 @@
-# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-nonfree-tainted]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
 enabled=1
 metadata_expire=14d
 type=rpm-md
@@ -12,8 +11,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-tainted-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -23,8 +22,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-tainted-source]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
index 1d6657e..0a01dc5 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo
@@ -1,10 +1,9 @@
-# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-nonfree-updates]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=0
-enabled_metadata=0
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
@@ -12,8 +11,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
@@ -22,8 +21,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-updates-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
diff --git a/katsu/modules/base/repodir/rpmfusion-nonfree.repo b/katsu/modules/base/repodir/rpmfusion-nonfree.repo
index b536bcd..a5e135f 100644
--- a/katsu/modules/base/repodir/rpmfusion-nonfree.repo
+++ b/katsu/modules/base/repodir/rpmfusion-nonfree.repo
@@ -1,9 +1,7 @@
-# TODO: We're bypassing their mirrors because they're broken atm
-# you'll also want to change "development" in the baseurl link to "releases" once Fedora 41 is released
 [rpmfusion-nonfree]
 name=RPM Fusion for Fedora $releasever - Nonfree
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/os/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
 enabled=1
 enabled_metadata=1
 metadata_expire=14d
@@ -14,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/debug/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -25,8 +23,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Source
-baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/source/SRPMS/
-#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
+# baseurl=https://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md