From d61fa50ee8cebfb67510679ff9589b7fe255f633 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Sun, 3 Apr 2011 17:11:11 +0200
Subject: [PATCH] Do not create a dozen of useless key files

---
 qubes-release/fedora.repo        |  6 +++---
 qubes-release/qubes-r1-dom0.repo |  4 ++--
 qubes-release/qubes-release.spec | 13 -------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/qubes-release/fedora.repo b/qubes-release/fedora.repo
index d67274b..cb54929 100644
--- a/qubes-release/fedora.repo
+++ b/qubes-release/fedora.repo
@@ -6,7 +6,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-13&arch=x86_64
 enabled=0
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-x86_64
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-primary
 
 [fedora-debuginfo]
 name=Fedora 13 - x86_64 - Debug
@@ -16,7 +16,7 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-13&arch=
 enabled=0
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-x86_64
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-primary
 
 [fedora-source]
 name=Fedora 13 - Source
@@ -26,4 +26,4 @@ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-13&arch
 enabled=0
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-x86_64
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-primary
diff --git a/qubes-release/qubes-r1-dom0.repo b/qubes-release/qubes-r1-dom0.repo
index 86d9bc3..a6ececf 100644
--- a/qubes-release/qubes-r1-dom0.repo
+++ b/qubes-release/qubes-r1-dom0.repo
@@ -4,7 +4,7 @@ baseurl = http://qubes-os.org/yum/r1/dom0/rpm
 enabled = 1
 metadata_expire = 7d
 gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-x86_64
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-primary
 
 [qubes-testing]
 name = Qubes OS Repository
@@ -12,5 +12,5 @@ baseurl = http://qubes-os.org/yum/r1-testing/dom0/rpm
 enabled = 1
 metadata_expire = 7d
 gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-x86_64
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-primary
 
diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index ab233f0..a813ba2 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -54,19 +54,6 @@ 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 qubes location
-pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
-for dist in qubes-%{dist_version} fedora-%{fedora_base_version}
-  do
-  for arch in i386 x86_64 ppc ppc64
-    do
-    ln -s RPM-GPG-KEY-${dist}-primary RPM-GPG-KEY-${dist/-*}-$arch
-  done
-  ln -s RPM-GPG-KEY-${dist}-primary RPM-GPG-KEY-${dist/-*}
-done
-popd
-
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in {qubes,fedora}*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d