From 5b829aca7cbc0d8b7983b9b5c0a9a8e679e1509b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Feb 20 2008 20:18:58 +0000 Subject: fix yum api usage (#433555, ) --- diff --git a/mash-multilib_yum_reponame-fix.patch b/mash-multilib_yum_reponame-fix.patch new file mode 100644 index 0000000..c4a1d19 --- /dev/null +++ b/mash-multilib_yum_reponame-fix.patch @@ -0,0 +1,11 @@ +--- 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.spec b/mash.spec index d19f138..ddd84de 100644 --- a/mash.spec +++ b/mash.spec @@ -8,8 +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, ) - +Patch1: mash-noarch_build_nosrc-fix.patch +Patch2: mash-multilib_yum_reponame-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 @@ -23,7 +23,8 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch -p1 +%patch1 -p1 +%patch2 -p1 %build %{__python} setup.py build @@ -49,6 +50,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Feb 20 2008 Bill Nottingham - fix noarch w/o src.rpm logic (#433551, ) +- fix yum API usage (#433555, ) * Mon Nov 19 2007 Bill Nottingham 0.2.10-1 - handle non Packages/ repositories better (#350391)