From c5ffd2d906064ff013c2f5911c0d5601e7095fcf Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Sep 06 2007 15:05:07 +0000
Subject: backport multilib fixes


---

diff --git a/mash-multilib.patch b/mash-multilib.patch
new file mode 100644
index 0000000..e0d4aac
--- /dev/null
+++ b/mash-multilib.patch
@@ -0,0 +1,26 @@
+--- mash-0.1.18/mash/multilib.py	2007-06-21 12:29:30.000000000 -0400
++++ mash/mash/multilib.py	2007-09-06 10:23:04.000000000 -0400
+@@ -87,18 +109,18 @@
+         self.name = 'devel'
+     
+     def select(self, po):
+-        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel']
++        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel' ]
+         whitelist = ['perl']
+         if po.name in blacklist:
+             return False
+-        if po.name.startswith('kernel'):
+-            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
+-                if p_name == 'kernel-devel':
+-                    return False
+         if po.name in whitelist:
+             return True
+         if RuntimeMultilibMethod.select(self,po):
+             return True
++        if po.name.startswith('kernel'):
++            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
++                if p_name == 'kernel-devel':
++                    return False
+         if po.name.endswith('-devel'):
+             return True
+         return False
diff --git a/mash.spec b/mash.spec
index 5aa681c..b20805d 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -12,6 +12,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 BuildRequires:  python-devel
 BuildArch:      noarch
+Patch:		mash-multilib.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -20,6 +21,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %{__python} setup.py build
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mash
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting@redhat.com> 0.1.18-2
+- backport some multilib fixes from HEAD (#247321, #271761)
+
 * Thu Jun 21 2007 Bill Nottingham <notting@redhat.com> 0.1.18-1
 - pull in cyrus-sasl plugins (#245176)