rpms/mash/EL-5 mash-multilib-sync.patch, NONE, 1.1 mash.spec, 1.22, 1.23

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Fri Apr 11 14:07:34 UTC 2008


Author: notting

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

Modified Files:
	mash.spec 
Added Files:
	mash-multilib-sync.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


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/mash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mash.spec	20 Feb 2008 20:18:58 -0000	1.22
+++ mash.spec	11 Apr 2008 14:06:44 -0000	1.23
@@ -10,6 +10,7 @@
 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
@@ -23,8 +24,9 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
 
 %build
 %{__python} setup.py build
@@ -48,6 +50,9 @@
 %{_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>)




More information about the fedora-extras-commits mailing list