qubes-release: import all keys on update

qubes-release/qubes-release.spec

@@ -75,8 +75,9 @@ EOF
 # 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-1-primary
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-* || true
 fi