[mash/f16] enable inheritance on branched

[Dennis Gilmore]

commit b2d1c420072bfa9fce9021bfbc37f043564dbf3e
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Sat Jul 30 20:05:08 2011 -0500

    enable inheritance on branched

 0001-enable-inheritance-for-branched-config.patch |   25 +++++++++++++++++++++
 mash.spec                                         |    7 +++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0001-enable-inheritance-for-branched-config.patch b/0001-enable-inheritance-for-branched-config.patch
new file mode 100644
index 0000000..048ed2c
--- /dev/null
+++ b/0001-enable-inheritance-for-branched-config.patch
@@ -0,0 +1,25 @@
+From bf66b19fa12e62e71f065647d25aa98dd6c90e60 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Sat, 30 Jul 2011 19:30:55 -0500
+Subject: [PATCH] enable inheritance for branched config
+
+---
+ configs/branched.mash |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configs/branched.mash b/configs/branched.mash
+index f4f9530..b4db8e3 100644
+--- a/configs/branched.mash
++++ b/configs/branched.mash
+@@ -8,7 +8,7 @@ debuginfo = True
+ multilib = True
+ multilib_method = devel
+ tag = f16
+-inherit = False
++inherit = True
+ strict_keys = True
+ keys = A82BA4B7, 069C8460, 97A1071F, E8E40FDE, 57BBCCBA, D22E77F2, 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
+ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/15/%(arch)s/os/
+-- 
+1.7.6
+
diff --git a/mash.spec b/mash.spec
index c467b27..f645462 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.23
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
@@ -14,6 +14,7 @@ Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
 Patch1:	mash-new.patch
+Patch2: 0001-enable-inheritance-for-branched-config.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -23,6 +24,7 @@ any multlib RPMs that are necessary.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Sat Jul 30 2011 Dennis Gilmore <dennis at ausil.us> - 0.5.23-3.1
+- enable inheritance in branched
+
 * Thu Jul 28 2011 Bill Nottingham <notting at redhat.com> 0.5.23-3
 - unbreak rawhide