From 51be24993864150457b531320396561666af49e4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Jun 23 2008 20:44:39 +0000 Subject: fix scim-qt* --- diff --git a/mash-multilib-sync.patch b/mash-multilib-sync.patch index 30177a8..307249e 100644 --- a/mash-multilib-sync.patch +++ b/mash-multilib-sync.patch @@ -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 diff --git a/mash.spec b/mash.spec index dc1f368..77ea809 100644 --- a/mash.spec +++ b/mash.spec @@ -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 @@ any multlib RPMs that are necessary. %setup -q %patch1 -p0 %patch2 -p0 -%patch3 -p0 +%patch3 -p0 -b .foo %build %{__python} setup.py build @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mash %changelog +* Mon Jun 23 2008 Bill Nottingham 0.2.10-4 +- fix scim-qt* + * Mon Apr 14 2008 Bill Nottingham 0.2.10-3 - sync again