From c39779731ffd797c4b0a86a5d91d1c2eea647cb9 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sat, 26 Jan 2013 22:45:00 +0100
Subject: [PATCH] qubes-release: import all rpm-gpg keys

This is now the only rpm --import during system installation.
---
 qubes-release/qubes-release.spec | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index 0ba1dac..a4d47c4 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -72,13 +72,8 @@ cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
 EOF
 
 %post
-# On Mar 31, 2012, the Qubes signing key has changed
-# The new key is brought by this RPM, but we also
-# need to explicitly import it to RPM DB
-# Also need to import other keys - especially release 2 (for upgrade purpose)
-if [ $1 -gt 1 ]; then
-    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-* || true
-fi
+# Import all keys b/c rpm won't do it automatically (as opposite to yum)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* || true
 
 
 %clean