From 4823467a39065fd26fd0c91e848fa673f93371cd Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Apr 11 2008 14:07:04 +0000
Subject: sync multlib list for EL-5 sync F-8 with EL-5


---

diff --git a/mash-multilib-sync.patch b/mash-multilib-sync.patch
new file mode 100644
index 0000000..8aee29c
--- /dev/null
+++ b/mash-multilib-sync.patch
@@ -0,0 +1,21 @@
+--- mash/multilib.py	2007-09-25 15:33:41.000000000 -0400
++++ mash/multilib.py	2008-04-11 08:59:46.000000000 -0400
+@@ -89,12 +89,18 @@
+             # nss
+             if dirname in [ '/lib', '/lib64' ] and filename.startswith('libnss_'):
+                 return True
++            # alsa
++            if dirname in [ '/usr/lib/alsa-lib', '/usr/lib64/alsa-lib' ]:
++                return True
+             # mysql, qt, etc.
+             if dirname == '/etc/ld.so.conf.d' and filename.endswith('.conf'):
+                 return True
+ 	    # gtk2-engines
+ 	    if fnmatch(dirname, '/usr/lib*/gtk-2.0/*/engines'):
+ 		return True
++            # accessibility
++            if fnmatch(dirname, '/usr/lib*/gtk-2.0/modules'):
++                return True
+ 	    # scim-bridge-gtk	
+             if fnmatch(dirname, '/usr/lib*/gtk-2.0/immodules'):
+                 return True
diff --git a/mash-multilib_yum_reponame-fix.patch b/mash-multilib_yum_reponame-fix.patch
new file mode 100644
index 0000000..c4a1d19
--- /dev/null
+++ b/mash-multilib_yum_reponame-fix.patch
@@ -0,0 +1,11 @@
+--- mash/__init__.py.orig	2008-02-20 00:37:18.000000000 +0100
++++ mash/__init__.py	2008-02-20 00:37:55.000000000 +0100
+@@ -383,7 +383,7 @@ enabled=1
+         yumbase.doRpmDBSetup()
+         # Nggh.
+         yumbase.ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
+-        yumbase.doSackSetup(archlist = archlist, thisrepo=self.config.name)
++        yumbase.doSackSetup(archlist = archlist, thisrepo='%s-%s' % (self.config.name, arch))
+         yumbase.doSackFilelistPopulate()
+ 
+         filelist = []
diff --git a/mash-noarch_build_nosrc-fix.patch b/mash-noarch_build_nosrc-fix.patch
new file mode 100644
index 0000000..82601bf
--- /dev/null
+++ b/mash-noarch_build_nosrc-fix.patch
@@ -0,0 +1,10 @@
+--- mash/__init__.py.orig	2008-02-20 00:05:38.000000000 +0100
++++ mash/__init__.py	2008-02-20 00:05:48.000000000 +0100
+@@ -214,7 +214,6 @@ class Mash:
+                     excludearch[pkg['build_id']] = hdr['EXCLUDEARCH']
+                     exclusivearch[pkg['build_id']] = hdr['EXCLUSIVEARCH']
+                     fn.close()
+-                    continue
+ 
+                 if (excludearch[pkg['build_id']] and has_any(masharch.compat[target_arch], excludearch[pkg['build_id']])) or \
+                         (exclusivearch[pkg['build_id']] and not has_any(masharch.compat[target_arch], exclusivearch[pkg['build_id']])):
diff --git a/mash.spec b/mash.spec
index a2e64bf..31cfd2c 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,13 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.2.9
+Version:        0.2.10
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.redhat.com/notting/mash/
 Source0:        http://people.redhat.com/notting/mash/%{name}-%{version}.tar.gz
+Patch1:		mash-noarch_build_nosrc-fix.patch
+Patch2:		mash-multilib_yum_reponame-fix.patch
+Patch3:		mash-multilib-sync.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -21,6 +24,9 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
 
 %build
 %{__python} setup.py build
@@ -44,6 +50,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mash
 
 %changelog
+* Fri Apr 11 2008 Bill Nottingham <notting@redhat.com>
+- sync multilib list with HEAD
+
+* Wed Feb 20 2008 Bill Nottingham <notting@redhat.com>
+- fix noarch w/o src.rpm logic (#433551, <peter@pramberger.at>)
+- fix yum API usage (#433555, <peter@pramberger.at>)
+
+* Mon Nov 19 2007 Bill Nottingham <notting@redhat.com> 0.2.10-1
+- handle non Packages/ repositories better (#350391)
+
 * Fri Nov  9 2007 Bill Nottingham <notting@redhat.com> 0.2.9-1
 - handle noarch excludearch for packages without source
   rpms (<rob.myers@gtri.gatech.edu>)
diff --git a/sources b/sources
index c0e6c95..b72ff36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4cef3dc5bd0a6ca4fb72310ec25fbe9  mash-0.2.9.tar.gz
+0c2bfe44263977937ec2f88c3d0cb97c  mash-0.2.10.tar.gz