rpms/mash/EL-5 mash-multilib_yum_reponame-fix.patch, NONE, 1.1 mash.spec, 1.21, 1.22

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Wed Feb 20 20:19:49 UTC 2008


Author: notting

Update of /cvs/extras/rpms/mash/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29305

Modified Files:
	mash.spec 
Added Files:
	mash-multilib_yum_reponame-fix.patch 
Log Message:
fix yum api usage (#433555, <peter at pramberger.at>)


mash-multilib_yum_reponame-fix.patch:

--- NEW FILE mash-multilib_yum_reponame-fix.patch ---
--- 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 = []


Index: mash.spec
===================================================================
RCS file: /cvs/extras/rpms/mash/EL-5/mash.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mash.spec	20 Feb 2008 20:11:54 -0000	1.21
+++ mash.spec	20 Feb 2008 20:18:58 -0000	1.22
@@ -8,8 +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>)
-
+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 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -49,6 +50,7 @@
 %changelog
 * Wed Feb 20 2008 Bill Nottingham <notting at redhat.com>
 - fix noarch w/o src.rpm logic (#433551, <peter at pramberger.at>)
+- fix yum API usage (#433555, <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