rpms/mash/EL-5 mash-multilib-sync.patch, 1.2, 1.3 mash.spec, 1.25, 1.26

[Bill Nottingham (notting)]

Author: notting

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

Modified Files:
	mash-multilib-sync.patch mash.spec 
Log Message:
fix scim-qt*


mash-multilib-sync.patch:

Index: mash-multilib-sync.patch
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/mash-multilib-sync.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mash-multilib-sync.patch	14 Apr 2008 21:07:30 -0000	1.2
+++ mash-multilib-sync.patch	23 Jun 2008 20:44:39 -0000	1.3
@@ -1,6 +1,7 @@
---- mash/multilib.py.mult	2007-09-25 15:33:41.000000000 -0400
-+++ mash/multilib.py	2008-04-14 17:02:40.000000000 -0400
-@@ -66,7 +66,7 @@
+diff -up mash-0.2.10/mash/multilib.py.foo mash-0.2.10/mash/multilib.py
+--- mash-0.2.10/mash/multilib.py.foo	2007-09-25 15:33:41.000000000 -0400
++++ mash-0.2.10/mash/multilib.py	2008-06-23 16:42:00.000000000 -0400
+@@ -66,7 +66,7 @@ class RuntimeMultilibMethod(MultilibMeth
      
      def select(self, po):
          libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
@@ -9,7 +10,7 @@
          if po.name in whitelist:
              return True
          if MultilibMethod.select(self,po):
-@@ -89,12 +89,18 @@
+@@ -89,17 +89,23 @@ class RuntimeMultilibMethod(MultilibMeth
              # nss
              if dirname in [ '/lib', '/lib64' ] and filename.startswith('libnss_'):
                  return True
@@ -28,3 +29,10 @@
  	    # scim-bridge-gtk	
              if fnmatch(dirname, '/usr/lib*/gtk-2.0/immodules'):
                  return True
+-            # scim-qtimm
+-            if fnmatch(dirname, '/usr/lib*/qt-*/plugins/inputmethods'):
++            # scim-qt*
++            if fnmatch(dirname, '/usr/lib*/qt*/plugins/inputmethods'):
+                 return True
+ 	    
+         return False


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/mash.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mash.spec	14 Apr 2008 21:07:30 -0000	1.25
+++ mash.spec	23 Jun 2008 20:44:39 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.2.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -26,7 +26,7 @@
 %setup -q
 %patch1 -p0
 %patch2 -p0
-%patch3 -p0
+%patch3 -p0 -b .foo
 
 %build
 %{__python} setup.py build
@@ -50,6 +50,9 @@
 %{_datadir}/mash
 
 %changelog
+* Mon Jun 23 2008 Bill Nottingham <notting at redhat.com> 0.2.10-4
+- fix scim-qt*
+
 * Mon Apr 14 2008 Bill Nottingham <notting at redhat.com> 0.2.10-3
 - sync again