From dfe1d80a1eacab32a5c42c20f84d7e8e2a6bd770 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Oct 05 2009 17:15:26 +0000
Subject: New upstream 0.5.9 release


---

diff --git a/.cvsignore b/.cvsignore
index 33daab1..23101d2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mash-0.5.8.tar.gz
+mash-0.5.9.tar.gz
diff --git a/mash-debug.patch b/mash-debug.patch
deleted file mode 100644
index 0b6c28e..0000000
--- a/mash-debug.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/mash/metadata.py b/mash/metadata.py
-index 56bb377..b381833 100644
---- a/mash/metadata.py
-+++ b/mash/metadata.py
-@@ -113,21 +113,26 @@ class MetadataNew:
-                 return True
- 
-         def _matches(file, list):
-+            self.logger.info("Checking drpm %s" % (file,))
-             hdr = rpmUtils.miscutils.hdrFromPackage(ts, file)
-             fname = '%s-%s-%s.%s.rpm' % (hdr['name'], hdr['version'], hdr['release'], hdr['arch'])
-             if fname in list.keys():
-                 if _sigmatches(hdr, list[fname]):
-+                    self.logger.info("Finished checking drpm %s - success" % (file,))
-                     return True
-+            self.logger.info("Finished checking drpm %s - fail" % (file,))
-             return False
- 
-         def _copy(file, path):
-             if not os.path.exists('%s/drpms' % (path,)):
-                 os.mkdir('%s/drpms' % (path,))
-             destpath = '%s/drpms/%s' % (path, os.path.basename(file))
-+            self.logger.info("Copying drpm %s" % (file,))
-             try:
-                 os.link(file, destpath)
-             except OSError:
-                 shutil.copy(file, destpath)
-+            self.logger.info("Finished copying drpm %s" % (file,))
- 
-         fulllist = self.repomatic.getFileList(self.conf.directory, '.rpm')
-         filelist = {}
-@@ -150,7 +155,10 @@ class MetadataNew:
-                 except OSError:
-                     self.logger.error("Couldn't copy repodata from %s" % (self.previous,))
-             if self.conf.deltas:
-+                self.logger.info("Starting to copy old deltas for %s" % (path,))
-                 self._copy_in_deltas(path)
-+                self.logger.info("Finished copying old deltas for %s" % (path,))
-+        self.logger.info("Creating metadata for %s" % (path,))
-         self.repomatic.doPkgMetadata()
-         self.repomatic.doRepoMetadata()
-         self.repomatic.doFinalMove()
-diff --git a/mash/metadata.py b/mash/metadata.py
-index 938172a..59069c8 100644
---- a/mash/metadata.py
-+++ b/mash/metadata.py
-@@ -68,6 +68,7 @@ class MetadataNew:
-         self.conf.update = True
-         self.conf.quiet = True
-         self.conf.unique_md_filenames = True
-+        self.conf.profile = True
-         self.previous = None
-         self.logger = logger
- 
diff --git a/mash-f12key.patch b/mash-f12key.patch
deleted file mode 100644
index 4805746..0000000
--- a/mash-f12key.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 190201a52d9067e276f9e71ca5a68a338b4d8917
-Author: Bill Nottingham <notting@redhat.com>
-Date:   Mon Aug 10 15:32:18 2009 -0400
-
-    Add F12 key.
-
-diff --git a/configs/rawhide.mash b/configs/rawhide.mash
-index 124de62..6a68ef8 100644
---- a/configs/rawhide.mash
-+++ b/configs/rawhide.mash
-@@ -10,7 +10,7 @@ multilib_method = devel
- tag = dist-rawhide
- inherit = True
- strict_keys = False
--keys = D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
-+keys = 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
- repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/
- repoviewtitle = "Fedora Rawhide - %(arch)s"
- arches = i386 x86_64 ppc ppc64
diff --git a/mash.spec b/mash.spec
index 0f39a2e..fbd7071 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.8
-Release:        4%{?dist}
+Version:        0.5.9
+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-nodelta.patch
-Patch1:		mash-f12key.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,14 +44,11 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
-* Thu Aug 20 2009 Bill Nottingham <notting@redhat.com> 0.5.8-4
-- re-enable deltas
-
-* Tue Aug 11 2009 Bill Nottingham <notting@redhat.com> 0.5.8-3
-- add new F12 key to rawhide mash config
-
-* Fri Jul 24 2009 Bill Nottingham <notting@redhat.com> 0.5.8-2
-- disable deltas for rawhide during payload format mass rebuild
+* Mon Oct  5 2009 Bill Nottingham <notting@redhat.com> 0.5.9-1
+- set dist_tags & content_tags when making metadata; update rawhide config
+  (<jkeating@redhat.com>)
+- allow glibc-static as a devel package
+- allow making ancient yum-arch metadata
 
 * Mon Jun 29 2009 Bill Nottingham <notting@redhat.com> 0.5.8-1
 - noarch packages can have debuginfo too (#508746)
diff --git a/sources b/sources
index f5057bd..d36709d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf01baab29a01b70028bd2668d4455ea  mash-0.5.8.tar.gz
+2e392e76d2a20caad9bb3e400916bbbb  mash-0.5.9.tar.gz