[rpms/anaconda] f45: Backport PR #7233 to adjust to relocation of packaged repo configs

[rpms/anaconda] f45: Backport PR #7233 to adjust to relocation of packaged repo configs

[Adam Williamson]

A new commit has been pushed.

Repo   : rpms/anaconda
Branch : f45
Commit : 03761bdca28943ccf21ca1f658b190b3b678e304
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2026-08-12T10:46:30-07:00
Stats  : +61/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/anaconda/c/03761bdca28943ccf21ca1f658b190b3b678e304?branch=f45

Log:
Backport PR #7233 to adjust to relocation of packaged repo configs

---
diff --git a/0001-Handle-relocation-of-packaged-repo-configs-to-usr-sh.patch b/0001-Handle-relocation-of-packaged-repo-configs-to-usr-sh.patch
new file mode 100644
index 0000000..ff4e1b1
--- /dev/null
+++ b/0001-Handle-relocation-of-packaged-repo-configs-to-usr-sh.patch
@@ -0,0 +1,51 @@
+From 911a2fbaa5f4f5bfc58f96e98dc8566d73160c39 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Wed, 12 Aug 2026 09:58:14 -0700
+Subject: [PATCH] Handle relocation of packaged repo configs to /usr/share/dnf5
+
+In Fedora 45+, packaged repo configs are moved to /usr/share/dnf5:
+https://fedoraproject.org/wiki/Changes/RelocateRpmRepoConfigsToUsr
+This adjusts anaconda appropriately. We drop the use of
+/etc/anaconda.repos.d because it is no longer needed. It was
+originally introduced in c51389518415d9182f01757314c7cfa272534557
+to solve a problem involving upgrades. anaconda has not handled
+upgrades since 2012. Other than that, we add the new directory to
+the DNF_REPO_DIRS constant and make a few minor tweaks in docs,
+docker configs and the like.
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ data/anaconda_options.txt                                     | 2 +-
+ pyanaconda/modules/payloads/constants.py                      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/anaconda_options.txt b/data/anaconda_options.txt
+index a34826d0e0..bf1f755fc3 100644
+--- a/data/anaconda_options.txt
++++ b/data/anaconda_options.txt
+@@ -79,7 +79,7 @@ it takes precedence over all other methods of finding the install.img. Otherwise
+ to find the install.img first on any existing CD, and then from the location given by repo.
+ If only the stage2 option is given without repo, Anaconda will use whatever repos the installed
+ system would have enabled by default for installation. For instance, an install of a Fedora release
+-will attempt to use the Fedora mirrorlist given by /etc/yum.repos.d/fedora.repo from that release.
++will attempt to use the Fedora mirrorlist given by fedora.repo from that release.
+ 
+ addrepo
+ This option adds additional repositories to the installation. These repositories are used during
+diff --git a/pyanaconda/modules/payloads/constants.py b/pyanaconda/modules/payloads/constants.py
+index 5f790eb9fd..0db00ce68e 100644
+--- a/pyanaconda/modules/payloads/constants.py
++++ b/pyanaconda/modules/payloads/constants.py
+@@ -44,8 +44,8 @@ from pyanaconda.core.constants import (
+ 
+ # Locations of repo files.
+ DNF_REPO_DIRS = [
++    '/usr/share/dnf5/repos.d',
+     '/etc/yum.repos.d',
+-    '/etc/anaconda.repos.d'
+ ]
+ 
+ 
+-- 
+2.55.0
+

diff --git a/anaconda.spec b/anaconda.spec
index 8e0db06..e03ddb9 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 45.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExcludeArch: %{ix86}
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -13,6 +13,12 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
+# Adjust to
+# https://fedoraproject.org/wiki/Changes/RelocateRpmRepoConfigsToUsr
+# https://github.com/rhinstaller/anaconda/pull/7233
+# Hand-edited to drop modifications to files not present in tarball
+Patch: 0001-Handle-relocation-of-packaged-repo-configs-to-usr-sh.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -523,6 +529,9 @@ rm -rf \
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Wed Aug 12 2026 Adam Williamson <awilliam@redhat.com> - 45.17-2
+- Backport PR #7233 to adjust to relocation of packaged repo configs
+
 * Tue Aug 11 2026 Packit <hello@packit.dev> - 45.17-1
 - feat(bootc): support arbitrary mount points for bootc installations
   (rvykydal)