rpms/mash/F-7 mash-multilib.patch,NONE,1.1 mash.spec,1.6,1.7

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/mash/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv626

Modified Files:
	mash.spec 
Added Files:
	mash-multilib.patch 
Log Message:
backport multilib fixes


mash-multilib.patch:

--- NEW FILE mash-multilib.patch ---
--- 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


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-7/mash.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mash.spec	21 Jun 2007 17:30:43 -0000	1.6
+++ mash.spec	6 Sep 2007 15:05:07 -0000	1.7
@@ -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 @@
 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 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %{__python} setup.py build
@@ -43,6 +45,9 @@
 %{_datadir}/mash
 
 %changelog
+* Thu Sep  6 2007 Bill Nottingham <notting at redhat.com> 0.1.18-2
+- backport some multilib fixes from HEAD (#247321, #271761)
+
 * Thu Jun 21 2007 Bill Nottingham <notting at redhat.com> 0.1.18-1
 - pull in cyrus-sasl plugins (#245176)