[rpms/fedora-release] f45: remove f20 keys add f21

[rpms/fedora-release] f45: remove f20 keys add f21

[Dennis Gilmore]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 3c12aac235b7416cf6f0185cffa76289ec2dce94
            Author : Dennis Gilmore <dennis@ausil.us>
            Date   : 2013-11-13T23:45:27-06:00
            Stats  : +38/-28 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/3c12aac235b7416cf6f0185cffa76289ec2dce94?branch=f45

            Log:
            remove f20 keys add f21

- patch from Will Woods to use a archmap file for linking gpg keys
- add fields to /etc/os-release for rhbz#951119
- set skip_if_unavailable=False for rhbz#985354

---
diff --git a/fedora-release.spec b/fedora-release.spec
index ad14ad8..1fcc216 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -2,20 +2,19 @@
 %define dist_version 21
 %define bug_version Rawhide
 
-Summary:	Fedora release files
-Name:		fedora-release
-Version:	21
-Release:	0.1
-License:	GPLv2
-Group:		System Environment/Base
-URL:		http://fedoraproject.org
-Source:		%{name}-%{version}.tar.bz2
-Obsoletes:	redhat-release
-Provides:	redhat-release
-Provides:	system-release = %{version}-%{release}
+Summary:        Fedora release files
+Name:           fedora-release
+Version:        21
+Release:        0.2
+License:        GPLv2
+Group:          System Environment/Base
+URL:            http://fedoraproject.org
+Source:         %{name}-%{version}.tar.bz2
+Obsoletes:      redhat-release
+Provides:       redhat-release
+Provides:       system-release = %{version}-%{release}
 Requires:       fedora-release-rawhide = %{version}-%{release}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
+BuildArch:      noarch
 
 %description
 Fedora release files such as yum configs and various /etc/ files that
@@ -55,28 +54,34 @@ VERSION_ID=%{dist_version}
 PRETTY_NAME="Fedora %{dist_version} (%{release_name})"
 ANSI_COLOR="0;34"
 CPE_NAME="cpe:/o:fedoraproject:fedora:%{dist_version}"
+HOME_URL="https://fedoraproject.org/"
+BUG_REPORT_URL="https://bugzilla.redhat.com/"
 REDHAT_BUGZILLA_PRODUCT="Fedora"
 REDHAT_BUGZILLA_PRODUCT_VERSION=%{bug_version}
 REDHAT_SUPPORT_PRODUCT="Fedora"
 REDHAT_SUPPORT_PRODUCT_VERSION=%{bug_version}
 EOF
 
+# Install the keys
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-
 install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 
-# Install all the keys, link the primary keys to primary arch files
-# and to compat generic location
+# 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/
-for arch in i386 x86_64 armhfp
-  do
-  ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-%{dist_version}-$arch
+for keyfile in RPM-GPG-KEY*; do
+    key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary'
+    arches=$(sed -ne "s/^${key}://p" $RPM_BUILD_DIR/%{name}-%{version}/archmap) \
+        || echo "WARNING: no archmap entry for $key"
+    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 %
+    done
 done
+# and add symlink for compat generic location
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-%{dist_version}-fedora
-for arch in aarch64 ppc ppc64 s390 s390x
-  do
-  ln -s RPM-GPG-KEY-fedora-%{dist_version}-secondary RPM-GPG-KEY-fedora-%{dist_version}-$arch
-done
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -89,9 +94,9 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
 # dist macros.
 
-%%fedora		%{dist_version}
-%%dist		.fc%{dist_version}
-%%fc%{dist_version}		1
+%%fedora                %{dist_version}
+%%dist                .fc%{dist_version}
+%%fc%{dist_version}                1
 EOF
 
 %clean
@@ -118,8 +123,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 
-
 %changelog
+* Wed Nov 13 2013 Dennis Gilmore <dennis@ausil.us> - 21-0.2
+- remove f20 keys add f21
+- patch from Will Woods to use a archmap file for linking gpg keys
+- add fields to /etc/os-release for rhbz#951119
+- set skip_if_unavailable=False for rhbz#985354
+
 * Tue Aug 20 2013 Dennis Gilmore <dennis@ausil.us> - 21-0.1
 - setup for f21 rawhide
 

diff --git a/sources b/sources
index c790c1b..52c74cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0356023647860174e4abbda36d4a8949  fedora-release-21.tar.bz2
+a29757d2a0895e08019b014c4055cd9c  fedora-release-21.tar.bz2