diff --git a/.cvsignore b/.cvsignore index a6f9ec7..51dd369 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mash-0.5.14.tar.gz +mash-0.5.15.tar.gz diff --git a/0001-Turn-off-inheritance-in-branched.patch b/0001-Turn-off-inheritance-in-branched.patch deleted file mode 100644 index e5ca7f7..0000000 --- a/0001-Turn-off-inheritance-in-branched.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 587aac6b8f824c90763dd7cf34d060116d73aa41 Mon Sep 17 00:00:00 2001 -From: Jesse Keating -Date: Thu, 1 Apr 2010 10:24:16 -0700 -Subject: [PATCH] Turn off inheritance in branched. - -We specifically tag things into the branched tag, and thus we don't want -any previous release packages sneaking through (typically new packages). ---- - configs/branched.mash | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configs/branched.mash b/configs/branched.mash -index d8301e7..2d46d75 100644 ---- a/configs/branched.mash -+++ b/configs/branched.mash -@@ -8,7 +8,7 @@ debuginfo = True - multilib = True - multilib_method = devel - tag = dist-f13 --inherit = True -+inherit = False - strict_keys = False - keys = E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9 - repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/13/%(arch)s/os/ --- -1.7.0.1 - diff --git a/mash.spec b/mash.spec index b43417b..e680176 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.14 -Release: 1%{?dist}.1 +Version: 0.5.15 +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-Turn-off-inheritance-in-branched.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,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog -* Thu Apr 01 2010 Jesse Keating - 0.5.14-1.fc13.1 -- Patch to not use inheritance with branched +* Fri Apr 16 2010 Bill Nottingham 0.5.15-1 +- branched compose configuration tweaks +- speed up composes a teeny bit * Tue Feb 23 2010 Bill Nottingham 0.5.14-1 - further changes for NFR () diff --git a/sources b/sources index 9c3410e..0f7837f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d716fb9d408d6531da87c28f8ba9adb0 mash-0.5.14.tar.gz +31f2d56f02a0ca06690c21c1fa7deda9 mash-0.5.15.tar.gz