diff --git a/.cvsignore b/.cvsignore index 51dd369..2e41862 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mash-0.5.15.tar.gz +mash-0.5.16.tar.gz diff --git a/0001-Don-t-include-repodata-in-the-previous-path.patch b/0001-Don-t-include-repodata-in-the-previous-path.patch deleted file mode 100644 index 40ec383..0000000 --- a/0001-Don-t-include-repodata-in-the-previous-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0c185b62db9ae5f50a376f17d0d7da507d150226 Mon Sep 17 00:00:00 2001 -From: Jesse Keating -Date: Tue, 20 Apr 2010 14:45:55 -0700 -Subject: [PATCH] Don't include "repodata" in the previous path. - -Createrepo already looks for the repodata/ directory and finds things -within. If we add the repodata directory to the previous_path name -createrepo doesn't find any existing repodata to re-use. This has -slowed down composes likely since December of 2008. ---- - mash/__init__.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mash/__init__.py b/mash/__init__.py -index 9357d37..fb94400 100644 ---- a/mash/__init__.py -+++ b/mash/__init__.py -@@ -232,7 +232,7 @@ class Mash: - if self.config.previous: - prefix = os.path.join(self.config.outputdir, self.config.name, "") - suffix = repo_path.replace(prefix, "") -- previous_path = os.path.join(self.config.previous, suffix, "repodata") -+ previous_path = os.path.join(self.config.previous, suffix) - self.logger.info("createrepo: starting %s..." % (path,)) - status = self._makeMetadata(repo_path, repocache, arch, comps, previous = previous_path) - --- -1.7.0.1 - diff --git a/mash.spec b/mash.spec index f1fbc01..4bd0350 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.15 -Release: 2%{?dist} +Version: 0.5.16 +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 -Patch0: 0001-Don-t-include-repodata-in-the-previous-path.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 -%patch0 -p1 %build %{__python} setup.py build @@ -46,8 +44,8 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog -* Tue Apr 20 2010 Jesse Keating - 0.5.15-2 -- Add a patch to correctly set previous repodata path +* Wed Apr 21 2010 Bill Nottingham 0.5.16-1 +- fix use of prior repodata () * Fri Apr 16 2010 Bill Nottingham 0.5.15-1 - branched compose configuration tweaks diff --git a/sources b/sources index 0f7837f..eb61acc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31f2d56f02a0ca06690c21c1fa7deda9 mash-0.5.15.tar.gz +c488dc6acfbcb47cb4a13a6113c768e2 mash-0.5.16.tar.gz