From bcc743eb7165c517f09e453a05a4dada12d3433e Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Apr 21 2010 19:28:22 +0000
Subject: Sync with devel


---

diff --git a/.cvsignore b/.cvsignore
index 23101d2..2e41862 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mash-0.5.9.tar.gz
+mash-0.5.16.tar.gz
diff --git a/mash.spec b/mash.spec
index edf1444..4bd0350 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,15 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.9
-Release:        2%{?dist}
+Version:        0.5.16
+Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
 URL:            http://fedorahosted.org/releases/m/a/mash/
 Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
-Patch0:		mash-nosigcheck.patch
-Patch1:		mash-notags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -23,8 +21,6 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -48,8 +44,34 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
-* Tue Nov 10 2009 Bill Nottingham <notting@redhat.com> 0.5.9-2
-- revert distro_tags/content_tags for now
+* Wed Apr 21 2010 Bill Nottingham <notting@redhat.com> 0.5.16-1
+- fix use of prior repodata (<jkeating@redhat.com>)
+
+* Fri Apr 16 2010 Bill Nottingham <notting@redhat.com> 0.5.15-1
+- branched compose configuration tweaks
+- speed up composes a teeny bit
+
+* Tue Feb 23 2010 Bill Nottingham <notting@redhat.com> 0.5.14-1
+- further changes for NFR (<jkeating@redhat.com>)
+
+* Fri Feb 19 2010 Bill Nottingham <notting@redhat.com> 0.5.13-1
+- assorted fixes for no-frozen-rawhide
+- make package hash directories all lowercase
+
+* Wed Feb 17 2010 Bill Nottingham <notting@redhat.com> 0.5.12-1
+- adjust for branched trees and no-frozen-rawhide (<jkeating@redhat.com>)
+- allow for source repos to be optional (<jgregusk@redhat.com>)
+- allow for pulling all builds, not just latest (<kanarip@fedoraunity.org>)
+- enable hashed packages for rawhide
+
+* Fri Dec 18 2009 Bill Nottingham <notting@redhat.com> 0.5.11-1
+- allow package directories to be hashed by the package name
+  (adapted from <skvidal@fedoraproject.org>)
+
+* Mon Nov 16 2009 Bill Nottingham <notting@redhat.com> 0.5.10-1
+- fix up distro_tags and content_tags
+- bump rawhide version
+- there is no ppc in Fedora rawhide anymore (<jkeating@redhat.com>)
 
 * Mon Oct  5 2009 Bill Nottingham <notting@redhat.com> 0.5.9-1
 - set dist_tags & content_tags when making metadata; update rawhide config
diff --git a/sources b/sources
index d36709d..eb61acc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e392e76d2a20caad9bb3e400916bbbb  mash-0.5.9.tar.gz
+c488dc6acfbcb47cb4a13a6113c768e2  mash-0.5.16.tar.gz