From 09ad8fe3b4895ef3483c7bc2a0fbf189005e21ea Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Feb 20 2008 20:11:54 +0000 Subject: fix noarch w/o src.rpm logic (#433551, ) --- diff --git a/mash-noarch_build_nosrc-fix.patch b/mash-noarch_build_nosrc-fix.patch new file mode 100644 index 0000000..82601bf --- /dev/null +++ b/mash-noarch_build_nosrc-fix.patch @@ -0,0 +1,10 @@ +--- 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.spec b/mash.spec index 7219c77..d19f138 100644 --- a/mash.spec +++ b/mash.spec @@ -8,6 +8,8 @@ Group: Development/Tools License: GPL URL: http://people.redhat.com/notting/mash/ Source0: http://people.redhat.com/notting/mash/%{name}-%{version}.tar.gz +Patch1: fix noarch w/o src.rpm logic (#433551, ) + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 @@ -21,6 +23,7 @@ any multlib RPMs that are necessary. %prep %setup -q +%patch -p1 %build %{__python} setup.py build @@ -44,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mash %changelog +* Wed Feb 20 2008 Bill Nottingham +- fix noarch w/o src.rpm logic (#433551, ) + * Mon Nov 19 2007 Bill Nottingham 0.2.10-1 - handle non Packages/ repositories better (#350391)