rpms/mash/EL-5 mash-noarch_build_nosrc-fix.patch, NONE, 1.1 mash.spec, 1.20, 1.21
Bill Nottingham (notting)
fedora-extras-commits at redhat.com
Wed Feb 20 20:12:31 UTC 2008
Author: notting
Update of /cvs/extras/rpms/mash/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28788
Modified Files:
mash.spec
Added Files:
mash-noarch_build_nosrc-fix.patch
Log Message:
fix noarch w/o src.rpm logic (#433551, <peter at pramberger.at>)
mash-noarch_build_nosrc-fix.patch:
--- NEW FILE mash-noarch_build_nosrc-fix.patch ---
--- 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']])):
Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/mash.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mash.spec 28 Jan 2008 20:47:01 -0000 1.20
+++ mash.spec 20 Feb 2008 20:11:54 -0000 1.21
@@ -8,6 +8,8 @@
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, <peter at pramberger.at>)
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: yum, createrepo, koji
Conflicts: pungi < 1.0.0
@@ -21,6 +23,7 @@
%prep
%setup -q
+%patch -p1
%build
%{__python} setup.py build
@@ -44,6 +47,9 @@
%{_datadir}/mash
%changelog
+* Wed Feb 20 2008 Bill Nottingham <notting at redhat.com>
+- fix noarch w/o src.rpm logic (#433551, <peter at pramberger.at>)
+
* Mon Nov 19 2007 Bill Nottingham <notting at redhat.com> 0.2.10-1
- handle non Packages/ repositories better (#350391)
More information about the fedora-extras-commits
mailing list