[mash/el6/master] merge w/master

[Bill Nottingham]

commit 5a2f549e6b630122591e6a79e20f4c7c14942574
Author: Bill Nottingham <notting at redhat.com>
Date:   Tue Sep 28 12:04:35 2010 -0400

    merge w/master

 .gitignore            |    4 +++-
 mash-nosigcheck.patch |   13 -------------
 mash.spec             |   24 ++++++++++++++++++------
 sources               |    2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f509eb..b78476e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-mash-0.5.17.tar.gz
+mash-0.5.18.tar.gz
+mash-0.5.19.tar.gz
+/mash-0.5.20.tar.gz
diff --git a/mash.spec b/mash.spec
index 9ff52d2..e6e9cba 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.17
-Release:        2%{?dist}
+Version:        0.5.20
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -13,7 +13,6 @@ Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
-Patch:		mash-nosigcheck.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -22,7 +21,6 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 %{__python} setup.py build
@@ -46,8 +44,22 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
-* Mon Aug  2 2010 Bill Nottingham <notting at redhat.com> 0.5.17-2
-- turn off sigs again (#598584)
+* Tue Sep 28 2010 Bill Nottingham <notting at redhat.com> 0.5.20-1
+- solve multilib against parent repos if configured (#633136)
+- fix traceback when only binary RPMS exist (modified from #636697, <tguthmann at iseek.com.au>)
+- disable sigchecking on deltas in source, not via patch (#512454)
+- mark LSB-providing packages as multilib (#585858)
+- fix libmunge to catch more cases (#637172, <mschwendt at gmail.com>)
+- add krb5 plugin dir to multilib list (#632611)
+- add libstdc++-static as a multilib whitelist (#630581)
+- add dri as a multilib dir
+- arm arch compatiblitiy <dennis at ausil.us>
+
+* Fri Jul 30 2010 Bill Nottingham <notting at redhat.com> 0.5.19-1
+- retarget branched.mash at f14
+
+* Mon Jul 26 2010 Bill Nottingham <notting at redhat.com> 0.5.18-1
+- add F14 key (<jkeating at redhat.com>)
 
 * Fri Jun 25 2010 Bill Nottingham <notting at redhat.com> 0.5.17-1
 - fix copying of prior deltarpms, broken in 0.5.16 (#598584)
diff --git a/sources b/sources
index 7ae8422..f149ee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-858dad1a3b296ea9217bffed64b6711a  mash-0.5.17.tar.gz
+374d881a31121de61ad11fb12590f7e3  mash-0.5.20.tar.gz