From 17c99c3534ab161276140b752893468d453ceee2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Apr 11 2008 14:06:44 +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.spec b/mash.spec index ddd84de..31cfd2c 100644 --- a/mash.spec +++ b/mash.spec @@ -10,6 +10,7 @@ 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 @@ -23,8 +24,9 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 %build %{__python} setup.py build @@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mash %changelog +* Fri Apr 11 2008 Bill Nottingham +- sync multilib list with HEAD + * Wed Feb 20 2008 Bill Nottingham - fix noarch w/o src.rpm logic (#433551, ) - fix yum API usage (#433555, )