[rpms/fedora-repos] f45: make archmap entries mandatory, except symlinks

            A new commit has been pushed.

            Repo   : rpms/fedora-repos
            Branch : f45
            Commit : f1cc1f21d118ddae9f09120d862c18cd1a04e774
            Author : Kamil Páral <kparal@redhat.com>
            Date   : 2021-02-12T12:54:15+01:00
            Stats  : +13/-9 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-repos/c/f1cc1f21d118ddae9f09120d862c18cd1a04e774?branch=f45

            Log:
            make archmap entries mandatory, except symlinks

All GPG keys except symlinks must now have an entry in archmap. This is to
increase reliability and avoid frequent errors when updating this spec file.

---
diff --git a/archmap b/archmap
index e4793c4..63d86ce 100644
--- a/archmap
+++ b/archmap
@@ -1,8 +1,10 @@
 fedora-7-primary: i386 x86_64 ppc ppc64
 
 fedora-8-primary: i386 x86_64 ppc ppc64
+fedora-8-primary-original:
 
 fedora-9-primary: i386 x86_64 ppc ppc64
+fedora-9-primary-original:
 fedora-9-secondary: ia64
 
 fedora-10-primary: i386 x86_64 ppc ppc64
@@ -19,7 +21,7 @@ fedora-13-secondary: arm mips
 fedora-14-primary: i386 x86_64
 fedora-14-secondary: arm
 
-fedora-15-primary: i386 x86_64 
+fedora-15-primary: i386 x86_64
 fedora-15-secondary: arm armhfp ppc ppc64 s390 s390x
 
 fedora-16-primary: i386 x86_64
@@ -60,6 +62,7 @@ fedora-27-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
 
 fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x
+fedora-modularity:
 
 fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 
@@ -76,7 +79,3 @@ fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
 fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x
 
 fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x
-
-fedora-rawhide-primary: x86_64 armhfp aarch64 ppc64le s390x
-
-fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x

diff --git a/fedora-repos.spec b/fedora-repos.spec
index 12f2597..2a89673 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -3,7 +3,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        35
-Release:        0.10%{?eln:.eln%{eln}}
+Release:        0.11%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -170,9 +170,14 @@ pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 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
 for keyfile in RPM-GPG-KEY*; do
-    key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
-    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \
-        || echo "WARNING: no archmap entry for $key"
+    # resolve symlinks, so that we don't need to keep duplicate entries in archmap
+    real_keyfile=$(basename $(readlink -f $keyfile))
+    key=${real_keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
+    if ! grep -q "^${key}:" %{_sourcedir}/archmap; then
+        echo "ERROR: no archmap entry for $key"
+        exit 1
+    fi
+    arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap)
     for arch in $arches; do
         # replace last part with $arch (fedora-20-primary -> fedora-20-$arch)
         ln -s $keyfile ${keyfile%%-*}-$arch # NOTE: RPM replaces %% with %