From 214eb64c873eba0e8998077c0cd1ab2600a1ccf0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Dec 02 2010 20:06:57 +0000
Subject: Add ppc64 patch.


---

diff --git a/cc7f44.patch b/cc7f44.patch
new file mode 100644
index 0000000..9b690ed
--- /dev/null
+++ b/cc7f44.patch
@@ -0,0 +1,40 @@
+commit cc7f44b6a0183ca07e437bb03020dfef64520c74
+Author: Bill Nottingham <notting@redhat.com>
+Date:   Thu Dec 2 15:00:43 2010 -0500
+
+    Add a 'prefer_ppc64' arch option (<jwboyer@gmail.com>)
+
+diff --git a/mash/__init__.py b/mash/__init__.py
+index 8f5ff97..b1be033 100644
+--- a/mash/__init__.py
++++ b/mash/__init__.py
+@@ -82,6 +82,9 @@ class Mash:
+         self.config = config
+         self.session = koji.ClientSession(config.buildhost, {})
+         self._setupLogger()
++        if self.config.prefer_ppc64:
++            del masharch.biarch['ppc']
++            masharch.biarch.setdefault('ppc64','ppc')
+ 
+     def _setupLogger(self):
+         self.logger = logging.getLogger('mash')
+diff --git a/mash/config.py b/mash/config.py
+index 6508143..9b2351d 100644
+--- a/mash/config.py
++++ b/mash/config.py
+@@ -49,6 +49,7 @@ class MashConfig(config.BaseConfig):
+     latest = config.BoolOption(True)
+     distro_tags = config.Option()
+     content_tags = config.ListOption()
++    prefer_ppc64 = config.BoolOption(False)
+     distros = []
+     
+ class MashDistroConfig(config.BaseConfig):
+@@ -83,6 +84,7 @@ class MashDistroConfig(config.BaseConfig):
+     latest = config.Inherit(MashConfig.latest)
+     distro_tags = config.Inherit(MashConfig.distro_tags)
+     content_tags = config.Inherit(MashConfig.content_tags)
++    prefer_ppc64 = config.Inherit(MashConfig.prefer_ppc64)
+     hash_packages = config.BoolOption(False)
+     parent_repos = config.ListOption()
+     previous = None
diff --git a/mash.spec b/mash.spec
index c775cb8..67a5f4b 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.5.20
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -15,6 +15,7 @@ BuildRequires:  python-devel
 BuildArch:      noarch
 Patch2:		0001-Turn-off-inheritance-in-rawhide-releng-4224.patch
 Patch3:		bd4feb3.patch
+Patch4:		cc7f44.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -25,6 +26,7 @@ any multlib RPMs that are necessary.
 %setup -q
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__python} setup.py build
@@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Thu Dec 02 2010 Bill Nottingham <notting@redhat.com> - 0.5.20-7
+- add a knob for frobbing which ppc arch is preferred (<jwboyer@gmail.com>)
+
 * Tue Nov 09 2010 Bill Nottingham <notting@redhat.com> - 0.5.20-6
 - fix gdk-pixbuf loader path (#649339)
 - re-enable deltas