diff --git a/mash-multilib-sync.patch b/mash-multilib-sync.patch deleted file mode 100644 index 307249e..0000000 --- a/mash-multilib-sync.patch +++ /dev/null @@ -1,38 +0,0 @@ -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' ] -- whitelist = [ 'libgnat', 'wine', 'wine-arts', 'nspluginwrapper', 'libflashsupport', 'valgrind' ] -+ whitelist = [ 'libgnat', 'wine', 'wine-arts', 'nspluginwrapper', 'libflashsupport', 'pulseaudio-utils', 'valgrind' ] - if po.name in whitelist: - return True - if MultilibMethod.select(self,po): -@@ -89,17 +89,23 @@ class RuntimeMultilibMethod(MultilibMeth - # 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 -- # 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-multilib_yum_reponame-fix.patch b/mash-multilib_yum_reponame-fix.patch deleted file mode 100644 index c4a1d19..0000000 --- a/mash-multilib_yum_reponame-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 = [] diff --git a/mash-noarch_build_nosrc-fix.patch b/mash-noarch_build_nosrc-fix.patch deleted file mode 100644 index 82601bf..0000000 --- a/mash-noarch_build_nosrc-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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']])): diff --git a/mash-nosigcheck.patch b/mash-nosigcheck.patch new file mode 100644 index 0000000..022c0c2 --- /dev/null +++ b/mash-nosigcheck.patch @@ -0,0 +1,13 @@ +diff -up mash-0.5.8/mash/metadata.py.foo mash-0.5.8/mash/metadata.py +--- mash-0.5.8/mash/metadata.py.foo 2009-06-23 11:05:52.000000000 -0400 ++++ mash-0.5.8/mash/metadata.py 2009-07-21 16:06:53.000000000 -0400 +@@ -117,8 +117,7 @@ class MetadataNew: + hdr = rpmUtils.miscutils.hdrFromPackage(ts, file) + fname = '%s-%s-%s.%s.rpm' % (hdr['name'], hdr['version'], hdr['release'], hdr['arch']) + if fname in list.keys(): +- if _sigmatches(hdr, list[fname]): +- return True ++ return True + return False + + def _copy(file, path): diff --git a/mash.spec b/mash.spec index 0aa6b54..68fdc7c 100644 --- a/mash.spec +++ b/mash.spec @@ -2,12 +2,13 @@ Name: mash Version: 0.5.8 -Release: 1%{?dist} +Release: 2%{?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 +Patch0: mash-nosigcheck.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 @@ -21,6 +22,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build @@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT /var/cache/mash %changelog +* Tue Jul 21 2009 Bill Nottingham 0.5.8-2 +- don't sigcheck deltas + * Mon Jun 29 2009 Bill Nottingham 0.5.8-1 - noarch packages can have debuginfo too (#508746) - remove wine-arts from multilib whitelist (not needed, doesn't exist)