[mash] make sure secondary arch branched configs have the right key

[Dennis Gilmore]

commit c60dfd19ee5443a0a8d1fea2a32ca5e67f35b62e
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Apr 9 15:38:58 2012 -0500

    make sure secondary arch branched configs have the right key

 ...-secondary-key-id-to-the-secopndary-arch-.patch |   68 ++++++++++++++++++++
 mash.spec                                          |    7 ++-
 2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch b/0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch
new file mode 100644
index 0000000..3079901
--- /dev/null
+++ b/0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch
@@ -0,0 +1,68 @@
+From f07c842597b569834fe9fcd04ee33b856d002d96 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 9 Apr 2012 15:35:26 -0500
+Subject: [PATCH] add the f17-secondary key id to the secopndary arch branched
+ configs
+
+---
+ configs/branched.arm.mash   |    2 +-
+ configs/branched.ppc.mash   |    2 +-
+ configs/branched.s390.mash  |    2 +-
+ configs/branched.sparc.mash |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configs/branched.arm.mash b/configs/branched.arm.mash
+index 1d1b982..caf59c1 100644
+--- a/configs/branched.arm.mash
++++ b/configs/branched.arm.mash
+@@ -10,7 +10,7 @@ multilib_method = devel
+ tag = f17
+ inherit = False
+ strict_keys = True
+-keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
++keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = arm armhfp
+diff --git a/configs/branched.ppc.mash b/configs/branched.ppc.mash
+index 0d0bd08..dd0190a 100644
+--- a/configs/branched.ppc.mash
++++ b/configs/branched.ppc.mash
+@@ -10,7 +10,7 @@ multilib_method = devel
+ tag = f17
+ inherit = False
+ strict_keys = True
+-keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
++keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = ppc ppc64
+diff --git a/configs/branched.s390.mash b/configs/branched.s390.mash
+index 2d232a7..2a816b6 100644
+--- a/configs/branched.s390.mash
++++ b/configs/branched.s390.mash
+@@ -10,7 +10,7 @@ multilib_method = devel
+ tag = f17
+ inherit = True
+ strict_keys = True
+-keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
++keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = s390 s390x
+diff --git a/configs/branched.sparc.mash b/configs/branched.sparc.mash
+index a0b8f71..5537926 100644
+--- a/configs/branched.sparc.mash
++++ b/configs/branched.sparc.mash
+@@ -10,7 +10,7 @@ multilib_method = kernel
+ tag = f17
+ inherit = False
+ strict_keys = True
+-keys = 34E166FA, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
++keys = 34E166FA, F8DF67E6, A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora-secondary/development/17/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = sparc sparc64
+-- 
+1.7.9.3
+
diff --git a/mash.spec b/mash.spec
index d8289bc..af20053 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
@@ -15,6 +15,7 @@ BuildRequires:  python-devel
 BuildArch:      noarch
 Patch0:         0001-set-prefer_ppc64-to-true-on-ppc-configs.patch
 Patch1:         0002-set-the-repoviewurl-to-refleect-17-not-15.patch
+Patch2:         0001-add-the-f17-secondary-key-id-to-the-secopndary-arch-.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -25,6 +26,7 @@ any multlib RPMs that are necessary.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Mon Apr 09 2012 Dennis Gilmore <dennis at ausil.us> 0.5.26-3
+- make sure secondary arch branched configs have the right key
+
 * Tue Apr 03 2012 Dennis Gilmore <dennis at ausil.us> 0.5.26-2
 - pull in patches from upstream for secondary arch config fixes