[rpms/fedora-repos] f45: Enable the updates archive repo on non-rawhide.

[rpms/fedora-repos] f45: Enable the updates archive repo on non-rawhide.

[Dusty Mabe]

            A new commit has been pushed.

            Repo   : rpms/fedora-repos
            Branch : f45
            Commit : e245df682c5e2526284434354a612838bbc7d52b
            Author : Dusty Mabe <dusty@dustymabe.com>
            Date   : 2021-04-28T10:00:14-04:00
            Stats  : +15/-6 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-repos/c/e245df682c5e2526284434354a612838bbc7d52b?branch=f45

            Log:
            Enable the updates archive repo on non-rawhide.

The fedora-repos-archive RPM is only installed by default in places
where it is needed (i.e. OSTree based distributions). The yum repo
file delivered by the RPM should default to being enabled when on
a numbered version of Fedora (non-rawhide). This was the original
intention when I added it a while back.

---
diff --git a/fedora-repos.spec b/fedora-repos.spec
index dc21393..7f70dd1 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.3%{?eln:.eln%{eln}}
+Release:        0.4%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -201,10 +201,12 @@ done
 rawhide_enabled=1
 stable_enabled=0
 testing_enabled=0
+archive_enabled=0
 %else
 rawhide_enabled=0
 stable_enabled=1
 testing_enabled=%{updates_testing_enabled}
+archive_enabled=1
 %endif
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
@@ -215,6 +217,9 @@ done
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1
 done
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do
+    sed -i "s/^enabled=AUTO_VALUE$/enabled=${archive_enabled}/" $repo || exit 1
+done
 
 # Adjust Rawhide repo files to include Rawhide+1 GPG key.
 # This is necessary for the period when Rawhide gets bumped to N+1 and packages
@@ -254,13 +259,14 @@ done
 
 # Make sure correct repos were enabled/disabled
 enabled_repos=(fedora-cisco-openh264)
-disabled_repos=(fedora-updates-archive)
+disabled_repos=()
 %if %{rawhide_release} == %{version}
 enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
-disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular \
-  fedora-updates-testing fedora-updates-testing-modular)
+disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
+  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
 %else
-enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular)
+enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
+  fedora-updates-modular)
 disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln)
 %if %{updates_testing_enabled}
 enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
@@ -385,6 +391,9 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Wed Apr 28 2021 Dusty Mabe <dusty@dustymabe.com> - 35-0.4
+- Enable the updates archive repo on non-rawhide.
+
 * Fri Feb 19 2021 Petr Menšík <pemensik@redhat.com> - 35-0.3
 - Check arch key imports during build (#1872248)
 

diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo
index 4cc3551..1125c52 100644
--- a/fedora-updates-archive.repo
+++ b/fedora-updates-archive.repo
@@ -12,7 +12,7 @@
 [updates-archive]
 name=Fedora $releasever - $basearch - Updates Archive
 baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/
-enabled=0
+enabled=AUTO_VALUE
 metadata_expire=6h
 repo_gpgcheck=0
 type=rpm