dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: yum-arch
-# $Id$
-NAME := yum-arch
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

yum-arch-python26.patch

@@ -91,3 +91,27 @@ diff -up yum-2.2.2/yum/repos.py.p26 yum-2.2.2/yum/repos.py
              s.update(self.pkttag)
              s.update(struct.pack(">H", pkt_len))
              s.update(msg[idx_save:idx_save+pkt_len])
+--- yum-2.2.2/cli.py.p26	2010-02-14 08:00:21.000000000 +0100
++++ yum-2.2.2/cli.py	2010-02-14 08:00:59.000000000 +0100
+@@ -491,7 +491,7 @@
+                             needrepos.append(po.repoid)
+ 
+                     self.log(2, 'Importing Changelog Metadata')
+-                    self.repos.populateSack(with='otherdata', which=needrepos)
++                    self.repos.populateSack(mdtype='otherdata', which=needrepos)
+                     self.log(2, 'Generating RSS File for %s' % pkgtype)
+                         
+                     self.listPkgs(this_pkg_list, titles[pkgtype], outputType='rss')
+@@ -602,9 +602,9 @@
+             self.log(3, '%s' % self.pickleRecipe())
+             try:
+                 self.doRepoSetup(nosack=1)
+-                self.repos.populateSack(with='metadata', pickleonly=1)
+-                self.repos.populateSack(with='filelists', pickleonly=1)
+-                self.repos.populateSack(with='otherdata', pickleonly=1)
++                self.repos.populateSack(mdtype='metadata', pickleonly=1)
++                self.repos.populateSack(mdtype='filelists', pickleonly=1)
++                self.repos.populateSack(mdtype='otherdata', pickleonly=1)
+                 
+             except yum.Errors.YumBaseError, e:
+                 return 1, [str(e)]

yum-arch.spec

@@ -1,7 +1,7 @@
 Summary:  Extract headers from rpm in a old yum repository
 Name:     yum-arch
 Version:  2.2.2
-Release:  8%{?dist}
+Release:  9%{?dist}
 License:  GPLv2+
 Group:    System Environment/Base
 Source0:  http://linux.duke.edu/projects/yum/download/2.2/yum-%{version}.tar.gz
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Sun Feb 14 2010 Remi Collet <Fedora@FamilleCollet.com> - 2.2.2-9
+- improve python 2.6 patch (fix FTBFS #564994)
+
 * Sat Sep 26 2009 Remi Collet <Fedora@FamilleCollet.com> - 2.2.2-8
 - fix python 2.6 warnings (#521869)