[mash] update keys & configs

Tue Jul 26 18:21:47 UTC 2011

commit d80d78591389020cb5b2818e9b724f1bb7765aab
Author: Bill Nottingham <notting at redhat.com>
Date:   Tue Jul 26 14:20:18 2011 -0400

    update keys & configs

 mash-new.patch |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mash.spec      |    7 +++-
 2 files changed, 116 insertions(+), 1 deletions(-)
---

diff --git a/mash-new.patch b/mash-new.patch
new file mode 100644
index 0000000..7b7f2de
--- /dev/null
+++ b/mash-new.patch
@@ -0,0 +1,110 @@
+From dennis at ausil.us Tue Jul 26 09:22:28 2011
+Return-Path: <dennis at ausil.us>
+Received: from nostromo.devel.redhat.com (nostromo.devel.redhat.com [127.0.0.1])
+	by nostromo.devel.redhat.com (8.14.5/8.14.4) with ESMTP id p6QDInD3022249
+	for <notting at localhost>; Tue, 26 Jul 2011 09:22:28 -0400
+Received: from mail.corp.redhat.com [10.5.5.52]
+	by nostromo.devel.redhat.com with IMAP (fetchmail-6.3.20)
+	for <notting at localhost> (single-drop); Tue, 26 Jul 2011 09:22:28 -0400 (EDT)
+Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
+ zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
+ mail03.corp.redhat.com with LMTP; Tue, 26 Jul 2011 01:57:42 -0400 (EDT)
+Received: from localhost (localhost.localdomain [127.0.0.1])
+	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 492EB129FCA
+	for <notting at redhat.com>; Tue, 26 Jul 2011 01:57:42 -0400 (EDT)
+X-Quarantine-ID: <S5JBNnhfJY8Y>
+Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+	by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id S5JBNnhfJY8Y for <notting at redhat.com>;
+	Tue, 26 Jul 2011 01:57:42 -0400 (EDT)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+	by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3419F129FB2
+	for <notting at mail.corp.redhat.com>; Tue, 26 Jul 2011 01:57:42 -0400 (EDT)
+Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19])
+	by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6Q5vg48018203
+	for <notting at redhat.com>; Tue, 26 Jul 2011 01:57:42 -0400
+Received: from mail.ausil.us (mail.ausil.us [74.119.218.133])
+	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6Q5vck4008603
+	for <notting at redhat.com>; Tue, 26 Jul 2011 01:57:38 -0400
+Received: from localhost (unknown [127.0.0.1])
+	by mail.ausil.us (Postfix) with ESMTP id EAF4364813E;
+	Tue, 26 Jul 2011 06:03:09 +0000 (UTC)
+X-Virus-Scanned: amavisd-new at mail.ausil.us
+Received: from mail.ausil.us ([127.0.0.1])
+	by localhost (mail.ausil.us [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 2-vI7em4pc2J; Tue, 26 Jul 2011 06:03:05 +0000 (UTC)
+Received: from pegasus.ausil.us (osiris.ausil.us [75.149.73.105])
+	by mail.ausil.us (Postfix) with ESMTP id D393D6480DF;
+	Tue, 26 Jul 2011 06:03:04 +0000 (UTC)
+From: Dennis Gilmore <dennis at ausil.us>
+To: notting at redhat.com
+Cc: Dennis Gilmore <dennis at ausil.us>
+Subject: [PATCH] update mash configs for new tags, keys and the next releases
+Date: Tue, 26 Jul 2011 00:58:29 -0500
+Message-Id: <1311659909-6228-1-git-send-email-dennis at ausil.us>
+In-Reply-To: <blah-blah-blah>
+References: <blah-blah-blah>
+X-RedHat-Spam-Score: -1.191  (RP_MATCHES_RCVD)
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19
+Status: RO
+Content-Length: 1972
+
+---
+ configs/branched.mash |    8 ++++----
+ configs/rawhide.mash  |    6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configs/branched.mash b/configs/branched.mash
+index c59a062..f4f9530 100644
+--- a/configs/branched.mash
++++ b/configs/branched.mash
+@@ -1,19 +1,19 @@
+ # mash config file
+ 
+-[15]
++[16]
+ rpm_path = %(arch)s/os/Packages
+ repodata_path = %(arch)s/os/
+ source_path = source/SRPMS
+ debuginfo = True
+ multilib = True
+ multilib_method = devel
+-tag = dist-f15
++tag = f16
+ inherit = False
+ strict_keys = True
+-keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
++keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/
+ repoviewtitle = "Fedora Branched - %(arch)s"
+ arches = i386 x86_64
+ delta = True
+ # Change distro_tags as fedora-release version gets bumped
+-distro_tags = cpe:/o:fedoraproject:fedora:15 rawhide
++distro_tags = cpe:/o:fedoraproject:fedora:16 rawhide
+diff --git a/configs/rawhide.mash b/configs/rawhide.mash
+index 0d05428..b5d2ff8 100644
+--- a/configs/rawhide.mash
++++ b/configs/rawhide.mash
+@@ -7,13 +7,13 @@ source_path = source/SRPMS
+ debuginfo = True
+ multilib = True
+ multilib_method = devel
+-tag = dist-rawhide
++tag = rawhide
+ inherit = True
+ strict_keys = False
+-keys = 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
++keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/%(arch)s/os/
+ repoviewtitle = "Fedora Rawhide - %(arch)s"
+ arches = i386 x86_64
+ delta = True
+ # Change distro_tags as fedora-release version gets bumped
+-distro_tags = cpe:/o:fedoraproject:fedora:16 rawhide
++distro_tags = cpe:/o:fedoraproject:fedora:17 rawhide
+-- 
+1.7.6
+
+
diff --git a/mash.spec b/mash.spec
index 4e23a95..66f6a02 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
@@ -13,6 +13,7 @@ Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch1:	mash-new.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -21,6 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Jul 26 2011 Bill Nottingham <notting at redhat.com> 0.5.23-2
+- update keys and configs for F-16
+
 * Fri Jul 22 2011 Bill Nottingham <notting at redhat.com> 0.5.23-1
 - Fix file multilib method (from <joaopfv at br.ibm.com>)
 
