public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fedora-repos] rawhide: Relocate RPM repository configuration to /usr
@ 2026-08-11 13:18 Neal Gompa
0 siblings, 0 replies; only message in thread
From: Neal Gompa @ 2026-08-11 13:18 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/fedora-repos
Branch : rawhide
Commit : 7b4acfd695436b59a9fe24c678254ff7d8e673a9
Author : Neal Gompa <ngompa@fedoraproject.org>
Date : 2026-08-11T09:12:04-04:00
Stats : +92/-85 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-repos/c/7b4acfd695436b59a9fe24c678254ff7d8e673a9?branch=rawhide
Log:
Relocate RPM repository configuration to /usr
Reference: https://fedoraproject.org/wiki/Changes/RelocateRpmRepoConfigsToUsr
---
diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo
index e65c565..e732695 100644
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@@ -6,7 +6,7 @@ enabled=1
metadata_expire=14d
repo_gpgcheck=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=True
[fedora-cisco-openh264-debuginfo]
@@ -17,7 +17,7 @@ enabled=0
metadata_expire=14d
repo_gpgcheck=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=True
[fedora-cisco-openh264-source]
@@ -28,5 +28,5 @@ enabled=0
metadata_expire=14d
repo_gpgcheck=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=True
diff --git a/fedora-eln.repo b/fedora-eln.repo
index 83c373d..ba78932 100644
--- a/fedora-eln.repo
+++ b/fedora-eln.repo
@@ -29,7 +29,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-baseos-debuginfo]
@@ -41,7 +41,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-baseos-source]
@@ -53,7 +53,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -68,7 +68,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-appstream-debuginfo]
@@ -80,7 +80,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-appstream-source]
@@ -92,7 +92,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -107,7 +107,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-crb-debuginfo]
@@ -119,7 +119,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-crb-source]
@@ -131,7 +131,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -146,7 +146,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-extensions-debuginfo]
@@ -158,7 +158,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-extensions-source]
@@ -170,7 +170,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -185,7 +185,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-extras-debuginfo]
@@ -197,7 +197,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-extras-source]
@@ -209,7 +209,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -224,7 +224,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-ha-debuginfo]
@@ -236,7 +236,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-ha-source]
@@ -248,7 +248,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -263,7 +263,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-rt-debuginfo]
@@ -275,7 +275,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-rt-source]
@@ -287,7 +287,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -302,7 +302,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-nfv-debuginfo]
@@ -314,7 +314,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-nfv-source]
@@ -326,7 +326,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -341,7 +341,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-sap-debuginfo]
@@ -353,7 +353,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-sap-source]
@@ -365,7 +365,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
@@ -380,7 +380,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-saphana-debuginfo]
@@ -392,7 +392,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
[eln-saphana-source]
@@ -404,5 +404,5 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-eln-$basearch
skip_if_unavailable=False
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index f5172ea..6274ad5 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -29,7 +29,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
skip_if_unavailable=False
[rawhide-debuginfo]
@@ -41,7 +41,7 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
skip_if_unavailable=False
[rawhide-source]
@@ -53,5 +53,5 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
skip_if_unavailable=False
diff --git a/fedora-repos.spec b/fedora-repos.spec
index bc9dfea..5e91462 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,7 +4,7 @@
Summary: Fedora package repositories
Name: fedora-repos
Version: 45
-Release: 0.2%{?eln:.eln%{eln}}
+Release: 0.3%{?eln:.eln%{eln}}
License: MIT
URL: https://fedoraproject.org/
@@ -159,14 +159,15 @@ in a production environment.
%install
# Install the keys
-install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+install -d -m 755 %{buildroot}/etc/pki/rpm-gpg
+install -d -m 755 %{buildroot}%{_datadir}/pki/rpm-gpg
+install -m 644 %{_sourcedir}/RPM-GPG-KEY* %{buildroot}%{_datadir}/pki/rpm-gpg/
# Link the primary/secondary keys to arch files, according to archmap.
# Ex: if there's a key named RPM-GPG-KEY-fedora-19-primary, and archmap
# says "fedora-19-primary: i386 x86_64",
# RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key.
-pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+pushd %{buildroot}%{_datadir}/pki/rpm-gpg/
# Also add a symlink for Rawhide and ELN keys
ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-rawhide-primary
ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-eln-primary
@@ -189,15 +190,16 @@ ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora
popd
# Install the IMA certs
-install -d -m 755 $RPM_BUILD_ROOT/etc/keys/ima
-install -m 644 %{_sourcedir}/fedora*ima.der $RPM_BUILD_ROOT/etc/keys/ima/
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/ima/
-install -m 644 %{_sourcedir}/fedora-ima-ca.der $RPM_BUILD_ROOT/usr/share/ima/ca.der
+install -d -m 755 %{buildroot}/etc/keys/ima
+install -m 644 %{_sourcedir}/fedora*ima.der %{buildroot}/etc/keys/ima
+install -d -m 755 %{buildroot}%{_datadir}/ima/
+install -m 644 %{_sourcedir}/fedora-ima-ca.der %{buildroot}%{_datadir}/ima/ca.der
# Install repo files
-install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
+install -d -m 755 %{buildroot}/etc/yum.repos.d
+install -d -m 755 %{buildroot}%{_datadir}/dnf5/repos.d
for file in %{_sourcedir}/fedora*repo ; do
- install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
+ install -m 644 $file %{buildroot}%{_datadir}/dnf5/repos.d
done
# Enable or disable repos based on current release cycle state.
@@ -220,19 +222,19 @@ testing_enabled=%{updates_testing_enabled}
archive_enabled=1
eln_enabled=0
%endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-rawhide*.repo; do
sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-updates}.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora{,-updates}.repo; do
sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1
done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-updates-testing.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
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-updates-archive.repo; do
sed -i "s/^enabled=AUTO_VALUE$/enabled=${archive_enabled}/" $repo || exit 1
done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-eln*.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-eln*.repo; do
sed -i "s/^enabled=AUTO_VALUE$/enabled=${eln_enabled}/" $repo || exit 1
done
@@ -241,8 +243,8 @@ done
# start to be signed with a newer key. Without having the key specified in the
# repo file, the system would consider the new packages as untrusted.
rawhide_next=$((%{rawhide_release}+1))
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
- sed -i "/^gpgkey=/ s@AUTO_VALUE@file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-rawhide*.repo; do
+ sed -i "/^gpgkey=/ s@AUTO_VALUE@file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \
$repo || exit 1
done
@@ -252,20 +254,20 @@ expire_value='6h'
%else
expire_value='7d'
%endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora.repo; do
sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \
$repo || exit 1
done
# Install ostree remote config
-install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/
-install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
-install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/
+install -d -m 755 %{buildroot}/etc/ostree/remotes.d/
+install -m 644 %{_sourcedir}/fedora.conf %{buildroot}/etc/ostree/remotes.d/
+install -m 644 %{_sourcedir}/fedora-compose.conf %{buildroot}/etc/ostree/remotes.d/
%check
# Make sure all repo variables were substituted
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/*.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/*.repo; do
if grep -q AUTO_VALUE $repo; then
echo "ERROR: Repo $repo contains an unsubstituted placeholder value"
exit 1
@@ -295,13 +297,13 @@ disabled_repos+=(fedora-updates-testing)
%endif
for repo in ${enabled_repos[@]}; do
- if ! grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
+ if ! grep -q 'enabled=1' %{buildroot}%{_datadir}/dnf5/repos.d/${repo}.repo; then
echo "ERROR: Repo $repo should have been enabled, but it isn't"
exit 1
fi
done
for repo in ${disabled_repos[@]}; do
- if grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then
+ if grep -q 'enabled=1' %{buildroot}%{_datadir}/dnf5/repos.d/${repo}.repo; then
echo "ERROR: Repo $repo should have been disabled, but it isn't"
exit 1
fi
@@ -309,7 +311,7 @@ done
# Make sure updates-testing is not enabled in a Final (stable) release
%if "%{release}" >= "1"
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-updates-testing.repo; do
if grep -q 'enabled=1' $repo; then
echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't"
exit 1
@@ -323,7 +325,7 @@ expire_value='6h'
%else
expire_value='7d'
%endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora.repo; do
lines=$(grep '^metadata_expire=' $repo | sort | uniq)
if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then
echo "ERROR: Non-matching metadata_expire lines in $repo: $lines"
@@ -338,13 +340,13 @@ done
# Make sure the Rawhide+1 key wasn't forgotten to be created
rawhide_next=$((%{rawhide_release}+1))
test -n "$rawhide_next" || exit 1
-if ! test -f $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then
+if ! test -f %{buildroot}%{_datadir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then
echo "ERROR: GPG key for Fedora ${rawhide_next} is not present"
exit 1
fi
# Make sure the Rawhide+1 key is present in Rawhide repo files
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
+for repo in %{buildroot}%{_datadir}/dnf5/repos.d/fedora-rawhide*.repo; do
gpg_lines=$(grep '^gpgkey=' $repo)
if test -z "$gpg_lines"; then
echo "ERROR: No gpgkey= lines in $repo"
@@ -368,8 +370,8 @@ for VER in %{version} %{rawhide_release} ${rawhide_next}; do
for ARCH in $(sed -ne "s/^fedora-${VER}-primary://p" %{_sourcedir}/archmap)
do
gpg --no-default-keyring --keyring="$TMPRING" \
- --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH
- rpm --dbpath "$DBPATH" --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH --test
+ --import %{buildroot}%{_datadir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH
+ rpm --dbpath "$DBPATH" --import %{buildroot}%{_datadir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-$VER-$ARCH --test
done
# Ensure some arch key was imported
gpg --no-default-keyring --keyring="$TMPRING" --list-keys | grep -A 2 '^pub\s'
@@ -378,25 +380,27 @@ rm -f "$TMPRING"
%files
%dir /etc/yum.repos.d
-%config(noreplace) /etc/yum.repos.d/fedora.repo
-%config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
-%config(noreplace) /etc/yum.repos.d/fedora-updates.repo
-%config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
+%dir %{_datadir}/dnf5/repos.d
+%{_datadir}/dnf5/repos.d/fedora.repo
+%{_datadir}/dnf5/repos.d/fedora-cisco-openh264.repo
+%{_datadir}/dnf5/repos.d/fedora-updates.repo
+%{_datadir}/dnf5/repos.d/fedora-updates-testing.repo
%files archive
-%config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo
+%{_datadir}/dnf5/repos.d/fedora-updates-archive.repo
%files rawhide
-%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
+%{_datadir}/dnf5/repos.d/fedora-rawhide.repo
%files -n fedora-gpg-keys
%dir /etc/pki/rpm-gpg
-/etc/pki/rpm-gpg/RPM-GPG-KEY-*
+%dir %{_datadir}/pki/rpm-gpg
+%{_datadir}/pki/rpm-gpg/RPM-GPG-KEY-*
# ima-certs
/etc/keys/ima/fedora*ima*
-/usr/share/ima/ca.der
+%{_datadir}/ima/ca.der
%files ostree
@@ -405,10 +409,13 @@ rm -f "$TMPRING"
/etc/ostree/remotes.d/fedora-compose.conf
%files eln
-%config(noreplace) /etc/yum.repos.d/fedora-eln.repo
+%{_datadir}/dnf5/repos.d/fedora-eln.repo
%changelog
+* Tue Aug 11 2026 Neal Gompa <ngompa@fedoraproject.org> - 45-0.3
+- Relocate RPM repository configuration to /usr
+
* Fri Aug 07 2026 Kevin Fenzi <kevin@scrye.com> - 45-0.2
- Add Extensions to ELN repos
diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo
index 1125c52..75cb3cd 100644
--- a/fedora-updates-archive.repo
+++ b/fedora-updates-archive.repo
@@ -17,6 +17,6 @@ metadata_expire=6h
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=True
cost=10000 # default is 1000
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index 91dc671..bf66553 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -8,7 +8,7 @@ repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[updates-testing-debuginfo]
@@ -20,7 +20,7 @@ repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[updates-testing-source]
@@ -32,5 +32,5 @@ repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 80ccb4d..277ace1 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -8,7 +8,7 @@ repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[updates-debuginfo]
@@ -20,7 +20,7 @@ repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[updates-source]
@@ -32,5 +32,5 @@ repo_gpgcheck=0
type=rpm
gpgcheck=1
metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
diff --git a/fedora.repo b/fedora.repo
index 66d4de7..53a2eed 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -8,7 +8,7 @@ metadata_expire=AUTO_VALUE
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[fedora-debuginfo]
@@ -20,7 +20,7 @@ metadata_expire=AUTO_VALUE
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
[fedora-source]
@@ -32,5 +32,5 @@ metadata_expire=AUTO_VALUE
repo_gpgcheck=0
type=rpm
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
skip_if_unavailable=False
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-11 13:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-11 13:18 [rpms/fedora-repos] rawhide: Relocate RPM repository configuration to /usr Neal Gompa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox