| |
@@ -14,6 +14,8 @@
|
| |
Obsoletes: fedora-repos-modular < 29-0.6
|
| |
Provides: fedora-repos-modular = %{version}-%{release}
|
| |
BuildArch: noarch
|
| |
+ # Required by %%check
|
| |
+ BuildRequires: gnupg
|
| |
|
| |
Source1: archmap
|
| |
Source2: fedora.repo
|
| |
@@ -150,8 +152,11 @@
|
| |
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"
|
| |
+ 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 %
|
| |
@@ -171,6 +176,19 @@
|
| |
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/
|
| |
|
| |
+ # Check the builder is on supported architectures
|
| |
+ TMPRING=$(mktemp)
|
| |
+ ARCH=$(arch)
|
| |
+ case "$ARCH" in
|
| |
+ i?86) BASEARCH=i386 ;;
|
| |
+ armv?l) BASEARCH=armhfp ;;
|
| |
+ *) BASEARCH=$ARCH ;;
|
| |
+ esac
|
| |
+ for VER in %{version} %{rawhide_release}; do
|
| |
+ gpg --no-default-keyring --keyring="$TMPRING" \
|
| |
+ --import $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-fedora-${VER}-$BASEARCH
|
| |
+ done
|
| |
+ rm -f "$TMPRING"
|
| |
%files
|
| |
%dir /etc/yum.repos.d
|
| |
%config(noreplace) /etc/yum.repos.d/fedora.repo
|
| |
pemensik
commented 2 years ago
I think by mistake only fedora-34-primary was added to fedora-gpg-keys package. Add also platform specific links to new package.