diff --git a/0001-Turn-off-inheritance-in-branched.patch b/0001-Turn-off-inheritance-in-branched.patch new file mode 100644 index 0000000..e5ca7f7 --- /dev/null +++ b/0001-Turn-off-inheritance-in-branched.patch @@ -0,0 +1,27 @@ +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 65beba6..fe50274 100644 --- a/mash.spec +++ b/mash.spec @@ -2,7 +2,7 @@ Name: mash Version: 0.5.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL @@ -13,6 +13,7 @@ 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 @@ -21,6 +22,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Thu Apr 01 2010 Jesse Keating - 0.5.14-2 +- Patch to not use inheritance with branched + * Tue Feb 23 2010 Bill Nottingham 0.5.14-1 - further changes for NFR ()