rpms/mash/F-8 mash-multilib-sync.patch, NONE, 1.1 mash-multilib_yum_reponame-fix.patch, NONE, 1.1 mash-noarch_build_nosrc-fix.patch, NONE, 1.1 mash.spec, 1.19, 1.20 sources, 1.22, 1.23

[Bill Nottingham (notting)]

Author: notting

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

Modified Files:
	mash.spec sources 
Added Files:
	mash-multilib-sync.patch mash-multilib_yum_reponame-fix.patch 
	mash-noarch_build_nosrc-fix.patch 
Log Message:
sync multlib list for EL-5
sync F-8 with EL-5


mash-multilib-sync.patch:

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

mash-multilib_yum_reponame-fix.patch:

--- NEW FILE mash-multilib_yum_reponame-fix.patch ---
--- 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 = []

mash-noarch_build_nosrc-fix.patch:

--- NEW FILE mash-noarch_build_nosrc-fix.patch ---
--- 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']])):


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/F-8/mash.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mash.spec	9 Nov 2007 21:09:18 -0000	1.19
+++ mash.spec	11 Apr 2008 14:07:04 -0000	1.20
@@ -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 @@
 
 %prep
 %setup -q
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
 
 %build
 %{__python} setup.py build
@@ -44,6 +50,16 @@
 %{_datadir}/mash
 
 %changelog
+* Fri Apr 11 2008 Bill Nottingham <notting at redhat.com>
+- sync multilib list with HEAD
+
+* Wed Feb 20 2008 Bill Nottingham <notting at redhat.com>
+- fix noarch w/o src.rpm logic (#433551, <peter at pramberger.at>)
+- fix yum API usage (#433555, <peter at pramberger.at>)
+
+* Mon Nov 19 2007 Bill Nottingham <notting at redhat.com> 0.2.10-1
+- handle non Packages/ repositories better (#350391)
+
 * Fri Nov  9 2007 Bill Nottingham <notting at redhat.com> 0.2.9-1
 - handle noarch excludearch for packages without source
   rpms (<rob.myers at gtri.gatech.edu>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mash/F-8/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Nov 2007 21:09:18 -0000	1.22
+++ sources	11 Apr 2008 14:07:04 -0000	1.23
@@ -1 +1 @@
-e4cef3dc5bd0a6ca4fb72310ec25fbe9  mash-0.2.9.tar.gz
+0c2bfe44263977937ec2f88c3d0cb97c  mash-0.2.10.tar.gz