Superseded by DNF. For details, see: https://fedoraproject.org/wiki/Changes/Retire_YUM_3

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-yum-3.2.26.tar.gz

0001-check-reqpo-exists-in-compare_providers.patch

@@ -1,47 +0,0 @@
-commit 63540521709205dd601994e2b05b7ddd3712b3a1
-Author: Seth Vidal <skvidal@fedoraproject.org>
-Date:   Thu Jul 10 12:21:29 2008 -0400
-
-    make sure the reqpo exists before we compare it
-
-diff --git a/yum/depsolve.py b/yum/depsolve.py
-index 8bb2cf1..2577cef 100644
---- a/yum/depsolve.py
-+++ b/yum/depsolve.py
-@@ -986,8 +986,13 @@ class Depsolve(object):
-                     if obsoleted:
-                         pkgresults[po] -= 1024
-                         break
--
--                for thisarch in (reqpo.arch, getBestArch()):
-+                
-+                if reqpo:
-+                    arches = (reqpo.arch, getBestArch())
-+                else:
-+                    arches = (getBestArch())
-+                
-+                for thisarch in arches:
-                     res = _compare_arch_distance(po, nextpo, thisarch)
-                     if not res:
-                         continue
-@@ -1001,13 +1006,13 @@ class Depsolve(object):
-                 self.verbose_logger.log(logginglevels.DEBUG_4,
-                     _('common sourcerpm %s and %s' % (po, reqpo)))
-                 pkgresults[po] += 20
--            
--            cpl = _common_prefix_len(po.name, reqpo.name)
--            if cpl > 2:
--                self.verbose_logger.log(logginglevels.DEBUG_4,
--                    _('common prefix of %s between %s and %s' % (cpl, po, reqpo)))
--            
--                pkgresults[po] += cpl*2
-+            if reqpo:
-+                cpl = _common_prefix_len(po.name, reqpo.name)
-+                if cpl > 2:
-+                    self.verbose_logger.log(logginglevels.DEBUG_4,
-+                        _('common prefix of %s between %s and %s' % (cpl, po, reqpo)))
-+                
-+                    pkgresults[po] += cpl*2
-             
-             pkgresults[po] += (len(po.name)*-1)
- 

0001-gotta-check-both-not-either-otherwise-filedeps-do.patch

@@ -1,25 +0,0 @@
-From 7a99a04d7f121a547d9af82738cd64b2fa8b04ca Mon Sep 17 00:00:00 2001
-From: Seth Vidal <skvidal@fedoraproject.org>
-Date: Sat, 17 May 2008 07:43:42 -0400
-Subject: [PATCH] gotta check both, not either - otherwise filedeps don't work :(
-
----
- yum/sqlitesack.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
-index c9fc26c..0b5d3e1 100644
---- a/yum/sqlitesack.py
-+++ b/yum/sqlitesack.py
-@@ -766,7 +766,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
-         # If it's not a provides or a filename, we are done
-         if prcotype != "provides":
-             return results
--        if not glob or name[0] != '/':
-+        if not glob and name[0] != '/':
-             return results
- 
-         # If it is a filename, search the primary.xml file info
--- 
-1.5.5.1
-

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: yum
-# $Id: Makefile,v 1.2 2007/10/15 19:38:44 notting Exp $
-NAME := yum
-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 $$d/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),)
-# attempt 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)

dead.package

@@ -0,0 +1 @@
+Superseded by DNF.  For details, see: https://fedoraproject.org/wiki/Changes/Retire_YUM_3

fix-kernel-updates.patch

@@ -1,19 +0,0 @@
-commit 50b01cf6329d00e09a8586527afd9b72466df506
-Author: Seth Vidal <skvidal@fedoraproject.org>
-Date:   Wed Feb 10 21:50:23 2010 -0500
-
-    fix typo which makes all kernel updates die :(
-
-diff --git a/yum/__init__.py b/yum/__init__.py
-index d0bd4cc..df952a8 100644
---- a/yum/__init__.py
-+++ b/yum/__init__.py
-@@ -4101,7 +4101,7 @@ class YumBase(depsolve.Depsolve):
-                             numleft -= 1
-                         
-         for po,rel in toremove:
--            txmbr = self.tsInfo.addErase(toremove)
-+            txmbr = self.tsInfo.addErase(po)
-             # Add a dep relation to the new version of the package, causing this one to be erased
-             # this way skipbroken, should clean out the old one, if the new one is skipped
-             txmbr.depends_on.append(rel)

geode-arch.patch

@@ -1,16 +0,0 @@
-diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
-index b493b6a..27c6d53 100644
---- a/rpmUtils/arch.py
-+++ b/rpmUtils/arch.py
-@@ -15,7 +15,7 @@ arches = {
-     # ia32
-     "athlon": "i686",
-     "i686": "i586",
--    "geode": "i586",
-+    "geode": "i686",
-     "i586": "i486",
-     "i486": "i386",
-     "i386": "noarch",
--- 
-1.6.2.5
-

installonlyn-enable.patch

@@ -1,23 +0,0 @@
---- yum/config.py~  2008-02-08 16:22:27.000000000 -0500
-+++ yum/config.py   2008-02-08 16:22:28.000000000 -0500
-@@ -593,7 +593,7 @@
-     # NOTE: If you set this to 2, then because it keeps the current kernel it
-     # means if you ever install an "old" kernel it'll get rid of the newest one
-     # so you probably want to use 3 as a minimum ... if you turn it on.
--    installonly_limit = PositiveIntOption(0, range_min=2,
-+    installonly_limit = PositiveIntOption(3, range_min=2,
-                                           names_of_0=["0", "<off>"])
-     kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
-             'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug'])
-
---- docs/yum.conf.5~	2009-05-11 11:55:25.000000000 -0400
-+++ docs/yum.conf.5	2009-05-11 11:55:25.000000000 -0400
-@@ -108,7 +108,7 @@
- 
- .IP \fBinstallonly_limit \fR
- Number of packages listed in installonlypkgs to keep installed at the same
--time. Setting to 0 disables this feature. Default is '0'. Note that this
-+time. Setting to 0 disables this feature. Default is '3'. Note that this
- functionality used to be in the "installonlyn" plugin, where this option was
- altered via. tokeep.
- 

installonlyn.py

@@ -1,69 +0,0 @@
-# A plugin for yum which only leaves n 'kernel' packages installed instead
-# of infinitely doing installonly
-#
-# Copyright 2005  Red Hat, Inc.
-# Jeremy Katz <katzj@redhat.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# version 0.93
-
-import os
-from rpmUtils import miscutils
-from yum.plugins import TYPE_CORE
-from yum.packages import YumInstalledPackage, comparePoEVR
-
-requires_api_version = '2.4'
-plugin_type = TYPE_CORE
-
-def get_running_kernel_version_release():
-    """This takes the output of uname and figures out the (version, release)
-    tuple for the running kernel."""
-    ver = os.uname()[2]
-    for s in ("bigmem", "enterprise", "smp", "hugemem", "PAE", "rt",
-              "guest", "hypervisor", "xen0", "xenU", "xen", "debug"):
-        if ver.endswith(s):
-            ver = ver.replace(s, "")
-    if ver.find("-") != -1:
-        (v, r) = ver.split("-", 1)
-        return (v, r)
-    return (None, None)
-
-def config_hook(conduit):
-    global num_tokeep
-    num_tokeep = conduit.confInt('main', 'tokeep', default=2)
-    
-def postresolve_hook(conduit):
-    ts = conduit.getTsInfo()
-    rpmdb = conduit.getRpmDB()
-    conf = conduit.getConf()
-    mems = ts.getMembers()
-    toremove = []
-    for instpkg in conf.installonlypkgs:
-        for m in mems:
-            if (m.name == instpkg or instpkg in m.po.provides_names) \
-                   and m.ts_state in ('i', 'u'):
-                installed = rpmdb.searchNevra(name=m.name)
-                if len(installed) >= num_tokeep - 1: # since we're adding one
-                    numleft = len(installed) - num_tokeep + 1
-                    (curv, curr) = get_running_kernel_version_release()
-                    
-                    installed.sort(comparePoEVR)
-                    for po in installed:
-                        if (po.version, po.release) == (curv, curr): 
-                            # don't remove running
-                            continue
-                        if numleft == 0:
-                            break
-                        toremove.append(po)
-                        numleft -= 1
-                        
-    map(lambda x: ts.addErase(x), toremove)

no-more-exactarchlist.patch

@@ -1,13 +0,0 @@
---- yum/config.py~	2009-07-22 12:47:52.000000000 -0400
-+++ yum/config.py	2009-07-22 12:48:39.000000000 -0400
-@@ -631,9 +631,7 @@
-                                           names_of_0=["0", "<off>"])
-     kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
-             'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug'])
--    exactarchlist = ListOption(['kernel', 'kernel-smp',
--            'kernel-hugemem', 'kernel-enterprise', 'kernel-bigmem',
--            'kernel-devel', 'kernel-PAE', 'kernel-PAE-debug'])
-+    exactarchlist = ListOption([])
-     tsflags = ListOption()
- 
-     assumeyes = BoolOption(False)

plugin.conf

@@ -1,2 +0,0 @@
-[main]
-enabled=1

revert-yum-dot-import.patch

@@ -1,159 +0,0 @@
-diff --git a/yum/__init__.py b/yum/__init__.py
-index 6e06005..a5b4922 100644
---- a/yum/__init__.py
-+++ b/yum/__init__.py
-@@ -32,9 +32,9 @@ import logging.config
- import operator
- import gzip
- 
--import i18n
--_ = i18n._
--P_ = i18n.P_
-+import yum.i18n
-+_ = yum.i18n._
-+P_ = yum.i18n.P_
- 
- import config
- from config import ParsingError, ConfigParser
-@@ -57,15 +57,15 @@ import plugins
- import logginglevels
- import yumRepo
- import callbacks
--import history
-+import yum.history
- 
- import warnings
- warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
- 
- from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR
- from constants import *
--from rpmtrans import RPMTransaction,SimpleCliCallBack
--from i18n import to_unicode, to_str
-+from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
-+from yum.i18n import to_unicode, to_str
- 
- import string
- 
-diff --git a/yum/comps.py b/yum/comps.py
-index d310b1b..2048c77 100755
---- a/yum/comps.py
-+++ b/yum/comps.py
-@@ -26,7 +26,7 @@ from Errors import CompsException
- # switch all compsexceptions to grouperrors after api break
- import fnmatch
- import re
--from i18n import to_unicode
-+from yum.i18n import to_unicode
- from misc import get_my_lang_code
- 
- lang_attr = '{http://www.w3.org/XML/1998/namespace}lang'
-diff --git a/yum/history.py b/yum/history.py
-index 18d2a41..644c2fc 100644
---- a/yum/history.py
-+++ b/yum/history.py
-@@ -23,10 +23,11 @@ import glob
- from weakref import proxy as weakref
- 
- from sqlutils import sqlite, executeSQL
--import misc
--from constants import *
--from packages import YumInstalledPackage, YumAvailablePackage, PackageObject
--from i18n import to_unicode
-+import yum.misc
-+import yum.constants
-+from yum.constants import *
-+from yum.packages import YumInstalledPackage, YumAvailablePackage, PackageObject
-+from yum.i18n import to_unicode
- 
- _history_dir = '/var/lib/yum/history'
- 
-diff --git a/yum/plugins.py b/yum/plugins.py
-index c0e510f..02f0d57 100644
---- a/yum/plugins.py
-+++ b/yum/plugins.py
-@@ -34,7 +34,7 @@ from weakref import proxy as weakref
- 
- from yum import _
- 
--from i18n import utf8_width
-+from yum.i18n import utf8_width
- 
- # TODO: expose rpm package sack objects to plugins (once finished)
- # TODO: allow plugins to use the existing config stuff to define options for
-diff --git a/yum/rpmsack.py b/yum/rpmsack.py
-index 74dd69d..fd05f9b 100644
---- a/yum/rpmsack.py
-+++ b/yum/rpmsack.py
-@@ -31,7 +31,7 @@ from packageSack import PackageSackBase, PackageSackVersion
- import fnmatch
- import re
- 
--from i18n import to_unicode
-+from yum.i18n import to_unicode
- import constants
- 
- class RPMInstalledPackage(YumInstalledPackage):
-diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
-index ed52df0..b1b896f 100644
---- a/yum/rpmtrans.py
-+++ b/yum/rpmtrans.py
-@@ -23,7 +23,7 @@ import time
- import logging
- import types
- import sys
--from constants import *
-+from yum.constants import *
- from yum import _
- import misc
- 
-diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
-index 89744ff..ce2988f 100644
---- a/yum/sqlitesack.py
-+++ b/yum/sqlitesack.py
-@@ -33,8 +33,8 @@ import rpmUtils.miscutils
- import sqlutils
- import constants
- import operator
--from misc import seq_max_split
--from i18n import to_utf8, to_unicode
-+from yum.misc import seq_max_split
-+from yum.i18n import to_utf8, to_unicode
- import sys
- import re
- 
-diff --git a/yum/update_md.py b/yum/update_md.py
-index 34179ea..b3a120e 100644
---- a/yum/update_md.py
-+++ b/yum/update_md.py
-@@ -24,10 +24,10 @@ Update metadata (updateinfo.xml) parsing.
- import sys
- import gzip
- 
--from i18n import utf8_text_wrap, to_utf8
--from yumRepo import YumRepository
--from packages import FakeRepository
--from misc import to_xml
-+from yum.i18n import utf8_text_wrap, to_utf8
-+from yum.yumRepo import YumRepository
-+from yum.packages import FakeRepository
-+from yum.misc import to_xml
- import Errors
- 
- import rpmUtils.miscutils
-diff --git a/yum/yumRepo.py b/yum/yumRepo.py
-index 2bc7476..ea8518a 100644
---- a/yum/yumRepo.py
-+++ b/yum/yumRepo.py
-@@ -32,9 +32,9 @@ from repos import Repository
- import parser
- import sqlitecachec
- import sqlitesack
--import config
--import misc
--import comps
-+from yum import config
-+from yum import misc
-+from yum import comps
- from constants import *
- import metalink
- 

sources

@@ -1 +0,0 @@
-84eede25288772f38719d5c9e13ae75e  yum-3.2.26.tar.gz

yum-2.6-stdout-trick.patch

@@ -1,11 +0,0 @@
---- yum/logginglevels.py~	2009-01-20 16:56:19.000000000 -0500
-+++ yum/logginglevels.py	2009-01-20 16:56:19.000000000 -0500
-@@ -141,7 +141,7 @@
-     plainformatter = logging.Formatter("%(message)s")
-     syslogformatter = logging.Formatter("yum: %(message)s")
-     
--    console_stdout = logging.StreamHandler(sys.stdout)
-+    console_stdout = logging.StreamHandler(sys.__stdout__)
-     console_stdout.setFormatter(plainformatter)
-     verbose = logging.getLogger("yum.verbose")
-     verbose.propagate = False

yum-3.2.20-listTrans-skip-broken.patch

@@ -1,51 +0,0 @@
-commit 5e405ec2e6651dc828c9b47075b6867a7e145536
-Author: James Antill <james@and.org>
-Date:   Mon Oct 27 23:59:37 2008 -0400
-
-    Iterate skipped_packages properly as they are pos not txmbrs, fixes BZ 468785
-
-diff --git a/output.py b/output.py
-index 502aa4b..3c2795c 100644
---- a/output.py
-+++ b/output.py
-@@ -789,8 +789,7 @@ class YumOutput:
-                             (_('Removing'), self.tsInfo.removed),
-                             (_('Installing for dependencies'), self.tsInfo.depinstalled),
-                             (_('Updating for dependencies'), self.tsInfo.depupdated),
--                            (_('Removing for dependencies'), self.tsInfo.depremoved),
--                            (_('Skipped (dependency problems)'), self.skipped_packages),]:
-+                            (_('Removing for dependencies'), self.tsInfo.depremoved)]:
-             lines = []
-             for txmbr in pkglist:
-                 (n,a,e,v,r) = txmbr.pkgtup
-@@ -813,6 +812,30 @@ class YumOutput:
- 
-             pkglist_lines.append((action, lines))
- 
-+        for (action, pkglist) in [(_('Skipped (dependency problems)'),
-+                                   self.skipped_packages),]:
-+            lines = []
-+            for po in pkglist:
-+                (n,a,e,v,r) = po.pkgtup
-+                evr = po.printVer()
-+                repoid = po.repoid
-+                pkgsize = float(po.size)
-+                size = self.format_number(pkgsize)
-+
-+                if a is None: # gpgkeys are weird
-+                    a = 'noarch'
-+
-+                lines.append((n, a, evr, repoid, size, []))
-+                #  Create a dict of field_length => number of packages, for
-+                # each field.
-+                for (d, v) in (("n",len(n)), ("v",len(evr)), ("r",len(repoid))):
-+                    data[d].setdefault(v, 0)
-+                    data[d][v] += 1
-+                if a_wid < len(a): # max() is only in 2.5.z
-+                    a_wid = len(a)
-+
-+            pkglist_lines.append((action, lines))
-+
-         if data['n']:
-             data    = [data['n'],    {}, data['v'], data['r'], {}]
-             columns = [1,         a_wid,         1,         1,  5]

yum-3.2.20-obsoletes-dict-fix.patch

@@ -1,18 +0,0 @@
-commit a59165490ebc236f7682ebc157bf069497958b42
-Author: James Antill <james@and.org>
-Date:   Thu Dec 4 18:58:59 2008 -0500
-
-    Always have an obsoletes dict, so we can always call getObsoletesTuples() etc.
-
-diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
-index f348ae9..16f733b 100644
---- a/rpmUtils/updates.py
-+++ b/rpmUtils/updates.py
-@@ -54,6 +54,7 @@ class Updates:
-         self.updating_dict = {}
-         #debug, ignore me
-         self.debug = 0
-+        self.obsoletes = {}
- 
-     def _delFromDict(self, dict_, keys, value):
-         for key in keys:

yum-6hr-metadata_expire.patch

@@ -1,13 +0,0 @@
-diff --git a/yum/config.py b/yum/config.py
-index 2219605..13efd9e 100644
---- a/yum/config.py
-+++ b/yum/config.py
-@@ -653,7 +653,7 @@ class YumConf(StartupConf):
-     #  Time in seconds (1.5h), yum-updatesd runs once per. hour by default
-     # this time means we don't do interactive network checks/updates if
-     # yum-updatesd is running.
--    metadata_expire = SecondsOption(60 * 90)
-+    metadata_expire = SecondsOption(60 * 60 * 6) # 6 hours
-     mirrorlist_expire = SecondsOption(86400) # time in seconds (1 day)
-     rpm_check_debug = BoolOption(True)
-     disable_excludes = ListOption()    

yum-close-rpmdb-really.patch

@@ -1,48 +0,0 @@
-diff --git a/yum/__init__.py b/yum/__init__.py
-index 6378cdc..cc57e98 100644
---- a/yum/__init__.py
-+++ b/yum/__init__.py
-@@ -427,6 +427,9 @@ class YumBase(depsolve.Depsolve):
- 
-     def closeRpmDB(self):
-         """closes down the instances of the rpmdb we have wangling around"""
-+        if self._rpmdb is not None:
-+            self._rpmdb.ts = None
-+            self._rpmdb.dropCachedData()
-         self._rpmdb = None
-         self._ts = None
-         self._tsInfo = None
-@@ -1008,6 +1011,7 @@ class YumBase(depsolve.Depsolve):
-         # for any kind of install add from_repo to the yumdb, and the cmdline
-         # and the install reason
- 
-+        self.rpmdb.dropCachedData()
-         for txmbr in self.tsInfo:
-             if txmbr.output_state in TS_INSTALL_STATES:
-                 if not self.rpmdb.contains(po=txmbr.po):
-@@ -1037,7 +1041,7 @@ class YumBase(depsolve.Depsolve):
-             else:
-                 self.verbose_logger.log(logginglevels.DEBUG_2, 'What is this? %s' % txmbr.po)
- 
--
-+        self.rpmdb.dropCachedData()
- 
-     def costExcludePackages(self):
-         """exclude packages if they have an identical package in another repo
-
-diff --git a/yum/rpmsack.py b/yum/rpmsack.py
-index 5189b18..8556e9a 100644
---- a/yum/rpmsack.py
-+++ b/yum/rpmsack.py
-@@ -140,7 +140,10 @@ class RPMDBPackageSack(PackageSackBase):
-         self._simple_pkgtup_list = []
-         self._get_pro_cache = {}
-         self._get_req_cache = {}
--        misc.unshare_data()
-+        #  We can be called on python shutdown (due to yb.__del__), at which
-+        # point other modules might not be available.
-+        if misc is not None:
-+            misc.unshare_data()
-         self._cache = {
-             'provides' : { },
-             'requires' : { },

yum-manpage-files.patch

@@ -1,65 +0,0 @@
-diff -urN olddocs/yum.8 docs/yum.8
---- olddocs/yum.8	2008-03-17 12:09:29.000000000 -0400
-+++ docs/yum.8	2008-03-17 12:08:18.000000000 -0400
-@@ -339,8 +339,8 @@
- .PP
- .SH "FILES"
- .nf
--/etc/yum/yum.conf
--/etc/yum/repos.d/
-+/etc/yum.conf
-+/etc/yum.repos.d/
- /etc/yum/pluginconf.d/
- /var/cache/yum/
- .fi 
-
---- olddocs/yum.conf.5.orig	2009-01-21 13:33:04.000000000 -0500
-+++ docs/yum.conf.5	2009-01-21 13:34:47.000000000 -0500
-@@ -4,10 +4,10 @@
- \fByum.conf\fR \- Configuration file for \fByum(8)\fR.
- .SH "DESCRIPTION"
- .LP
--Yum uses a configuration file at \fB/etc/yum/yum.conf\fR.
-+Yum uses a configuration file at \fB/etc/yum.conf\fR.
- .LP
- Additional configuration files are also read from the directories set by the
--\fBreposdir\fR option (default is `/etc/yum/repos.d').
-+\fBreposdir\fR option (default is `/etc/yum.repos.d').
- See the \fBreposdir\fR option below for further details.
- 
- .SH "PARAMETERS"
-@@ -38,10 +38,10 @@
- 
- .IP \fBreposdir\fR
- A list of directories where yum should look for .repo files which define
--repositories to use. Default is `/etc/yum/repos.d'. Each
-+repositories to use. Default is `/etc/yum.repos.d'. Each
- file in this directory should contain one or more repository sections as
- documented in \fB[repository] options\fR below. These will be merged with the
--repositories defined in /etc/yum/yum.conf to form the complete set of
-+repositories defined in /etc/yum.conf to form the complete set of
- repositories that yum will use.
- 
- .IP \fBdebuglevel\fR
-@@ -511,8 +511,8 @@
- 
- .SH "URL INCLUDE SYNTAX"
- .LP
--The inclusion of external configuration files is supported for /etc/yum/yum.conf
--and the .repo files in the /etc/yum/repos.d directory. To include a URL, use a
-+The inclusion of external configuration files is supported for /etc/yum.conf
-+and the .repo files in the /etc/yum.repos.d directory. To include a URL, use a
- line of the following format:
- 
- include=url://to/some/location
-@@ -549,8 +549,8 @@
- 
- .SH "FILES"
- .nf
--/etc/yum/yum.conf
--/etc/yum/repos.d/
-+/etc/yum.conf
-+/etc/yum.repos.d/
- /etc/yum/pluginconf.d/
- 
- .SH "SEE ALSO"

yum-mirror-priority.patch

@@ -1,11 +0,0 @@
---- yum/config.py~	2008-03-04 16:21:49.000000000 -0500
-+++ yum/config.py	2008-03-04 16:21:49.000000000 -0500
-@@ -582,7 +582,7 @@
- 
-     commands = ListOption()
-     exclude = ListOption()
--    failovermethod = Option('roundrobin')
-+    failovermethod = Option('priority')
-     proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True)
-     proxy_username = Option()
-     proxy_password = Option()

yum-multilib-policy-best.patch

@@ -1,11 +0,0 @@
---- yum/config.py~	2009-10-14 15:52:38.000000000 -0400
-+++ yum/config.py	2009-10-14 15:59:57.000000000 -0400
-@@ -670,7 +670,7 @@
-     # similar but better :).
-     mdpolicy = ListOption(['group:primary'])
-     #  ('instant', 'group:all', 'group:main', 'group:small', 'group:primary'))
--    multilib_policy = SelectionOption('all',('best', 'all'))
-+    multilib_policy = SelectionOption('best',('best', 'all'))
-                  # all == install any/all arches you can
-                  # best == use the 'best  arch' for the system
-                  

yum-updatesd.conf.fedora

@@ -1,15 +0,0 @@
-[main]
-# how often to check for new updates (in seconds)
-run_interval = 3600
-# how often to allow checking on request (in seconds)
-updaterefresh = 600
-
-# how to send notifications (valid: dbus, email, syslog)
-emit_via = dbus
-
-# automatically install updates
-do_update = no
-# automatically download updates
-do_download = no
-# automatically download deps of updates
-do_download_deps = no

yum.conf.fedora

@@ -1,24 +0,0 @@
-[main]
-cachedir=/var/cache/yum/$basearch/$releasever
-keepcache=0
-debuglevel=2
-logfile=/var/log/yum.log
-exactarch=1
-obsoletes=1
-gpgcheck=1
-plugins=1
-installonly_limit=3
-color=never
-
-#  This is the default, if you make this bigger yum won't see if the metadata
-# is newer on the remote and so you'll "gain" the bandwidth of not having to
-# download the new metadata and "pay" for it by yum not having correct
-# information.
-#  It is esp. important, to have correct metadata, for distributions like
-# Fedora which don't keep old packages around. If you don't like this checking
-# interupting your command line usage, it's much better to have something
-# manually check the metadata once an hour (yum-updatesd will do this).
-# metadata_expire=90m
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum.repos.d

yum.spec

@@ -1,420 +0,0 @@
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
- 
-Summary: RPM installer/updater
-Name: yum
-Version: 3.2.26
-Release: 3%{?dist}
-License: GPLv2+
-Group: System Environment/Base
-Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
-Source1: yum.conf.fedora
-Source2: yum-updatesd.conf.fedora
-Patch0: installonlyn-enable.patch
-Patch1: yum-mirror-priority.patch
-Patch2: yum-manpage-files.patch
-Patch3: yum-multilib-policy-best.patch
-Patch4: no-more-exactarchlist.patch
-Patch5: geode-arch.patch
-Patch6: yum-HEAD.patch
-
-URL: http://yum.baseurl.org/
-BuildArch: noarch
-BuildRequires: python
-BuildRequires: gettext
-BuildRequires: intltool
-Conflicts: pirut < 1.1.4
-Requires: python >= 2.4, rpm-python, rpm >= 0:4.4.2
-Requires: python-iniparse
-Requires: python-sqlite
-Requires: python-urlgrabber >= 3.9.0-8
-Requires: yum-metadata-parser >= 1.1.0
-Requires: pygpgme
-Obsoletes: yum-skip-broken, yum-basearchonly
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Yum is a utility that can check for and automatically download and
-install updated RPM packages. Dependencies are obtained and downloaded 
-automatically prompting the user as necessary.
-
-%package updatesd
-Summary: Update notification daemon
-Group: Applications/System
-Requires: yum = %{version}-%{release}
-Requires: dbus-python
-Requires: pygobject2
-Requires(preun): /sbin/chkconfig
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(post): /sbin/service
-
-%description updatesd
-yum-updatesd provides a daemon which checks for available updates and 
-can notify you when they are available via email, syslog or dbus. 
-
-%prep
-%setup -q
-%patch1 -p0
-#%%%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
-%patch6 -p1
-
-%build
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/yum.conf
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/usr/lib/yum-plugins
-
-# for now, move repodir/yum.conf back
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum.conf
-
-# yum-updatesd has moved to the separate source version
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-updatesd.conf 
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/yum-updatesd
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/yum-updatesd
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/yum-updatesd*
-rm -f $RPM_BUILD_ROOT/%{_datadir}/yum-cli/yumupd.py*
-
-%find_lang %name
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}.lang
-%defattr(-, root, root, -)
-%doc README AUTHORS COPYING TODO INSTALL ChangeLog
-%config(noreplace) %{_sysconfdir}/yum.conf
-%dir %{_sysconfdir}/yum
-%config(noreplace) %{_sysconfdir}/yum/version-groups.conf
-%dir %{_sysconfdir}/yum.repos.d
-%config(noreplace) %{_sysconfdir}/logrotate.d/yum
-%{_sysconfdir}/bash_completion.d
-%dir %{_datadir}/yum-cli
-%{_datadir}/yum-cli/*
-%{_bindir}/yum
-%{python_sitelib}/yum
-%{python_sitelib}/rpmUtils
-%dir /var/cache/yum
-%dir /var/lib/yum
-%{_mandir}/man*/yum.*
-%{_mandir}/man*/yum-shell*
-# plugin stuff
-%dir %{_sysconfdir}/yum/pluginconf.d 
-%dir /usr/lib/yum-plugins
-
-%changelog
-* Tue Feb 16 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.26-3
-- latest head - including fixes to searchPrcos
-
-* Wed Feb 10 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.26-2
-- grumble.
-
-* Tue Feb  9 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.26-1
-- final 3.2.26
-
-* Mon Feb  8 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-14
-- $uuid, pkgtags searching, latest HEAD patch - pre 3.2.26
-
-* Fri Jan 28 2010 James Antill <james at fedoraproject.org> - 3.2.25-13
-- A couple of bugfixes, most notably:
--  you can now install gpg keys again!
--  bad installed file requires don't get cached.
-
-* Fri Jan 22 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-12
-- someone forgot to push their changes
-
-* Fri Jan 22 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-11
-- more fixes, more fun
-
-* Fri Jan 15 2010 James Antill <james at fedoraproject.org> - 3.2.25-10
-- latest head
-- Fixes for pungi, rpmdb caching and kernel-PAE-devel duplicates finding
-- among others.
-
-* Mon Jan  4 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-8
-- latest head
-
-* Thu Dec 10 2009 James Antill <james at fedoraproject.org> - 3.2.25-7
-- Fixes the mash bug, lookup in the tsInfo too. :(
-- And fix the txmbr/po confusion ... third build the charm.
-
-* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
-- Fixes for yum clean all, BZ 544173
-- Also allow "yum clean rpmdb" to work, bad tester, bad.
-
-* Thu Dec  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-2
-- rebuild yum with latest HEAD patch
-- add rpmdb caching patch james wrote to see if it breaks everyone :)
-
-
-* Wed Oct 14 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-1
-- 3.2.25
-
-* Wed Sep 30 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-9
-- revert yum. import patch b/c it breaks a bunch of things
-
-* Wed Sep 30 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-8
-- fix up broken build b/c of version-groups.conf file
-
-* Tue Sep 29 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-7
-- fixes for odd outputs from ts.run and logs for what we store in history
-
-* Wed Sep 23 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-6
-- new head patch - fixes some issues with history and chroots
-
-* Mon Sep 21 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-5
-- latest head patch - includes yum history feature.
-
-* Tue Sep 15 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-4
-- new head patch - translation updates and a few bug fixes
-
-* Wed Sep  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-3
-- add geode arch patch for https://bugzilla.redhat.com/show_bug.cgi?id=518415
-
-
-* Thu Sep  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-2
-- modify cachedir to include variables
-
-* Thu Sep  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.24-1
-- 3.2.24
-
-* Wed Sep  2 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-16
-- fix globbing issue 520810
-
-* Mon Aug 31 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-15
-- one more head update - fixes some fairly ugly but kind of minor bugs
-
-* Tue Aug 18 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-14
-- update to latest head pre 3.2.24
-- add requirement on python-urlgrabber 3.9.0 and up
-
-* Wed Aug  5 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-13
-- latest head - right after freeze
-
-* Tue Aug  4 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-12
-- latest head - right before freeze :)
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.23-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul 22 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-10
-- remove exactarchlist by request for rawhide
-
-* Thu Jul  2 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-9
-- update to latest head - make livecd creation work again in rawhide
-- disable one of the man page patches until after 3.2.24 is released b/c
-  of the changes to the man page in the head patch
-
-
-* Mon Jun 22 2009 James Antill <james at fedoraproject.org> - 3.2.23-8
-- Update to latest head:
-- Fix old recursion bug, found by new code.
-- Resolves: bug#507220
-
-* Sun Jun 21 2009 James Antill <james at fedoraproject.org> - 3.2.23-6
-- Update to latest head:
-- Unbreak delPackage() excludes.
-- Other fixes/etc.
-
-* Fri Jun 19 2009 James Antill <james at fedoraproject.org> - 3.2.23-5
-- Actually apply the HEAD patch included yesterday :).
-
-* Thu Jun 18 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-4
-- update to latest head
-
-* Mon Jun  8 2009 Seth Vidal <skvidal at fedoraproject.org>
-- truncate changelog
-
-* Wed May 20 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-2
-- add patch to close rpmdb completely
-
-* Tue May 19 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.23-1
-- 3.2.23
-
-* Mon May 11 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.22-5
-- jump up to almost 3.2.23. 
-- had to move patch0 around a bit until we rebase to 3.2.23
-
-* Thu Apr  9 2009 James Antill <james at fedoraproject.org> - 3.2.22-4
-- fix typo for yum-complete-transaction message.
-
-* Wed Apr  8 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.22-3
-- fix for file:// urls which makes things in pungi/mash work
-
-* Tue Apr  7 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.22-2
-- yum-HEAD minus the yumdb patches
-
-* Tue Mar 24 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.22-1
-- 3.2.22 - 3 patches beyond 3.2.21-16
-
-* Mon Mar 16 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-16
-- fix for 490490
-
-* Fri Mar 13 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-15
-- update to upstream git to fix conditionals problem on anaconda installs
-
-* Thu Mar 12 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-14
-- latest HEAD
-
-* Tue Mar 10 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-13
-- f11beta build
-
-* Wed Mar  4 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-12
-- second verse, same as the first
-
-* Fri Feb 27 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-10
-- merge up a lot of fixes from latest HEAD
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.21-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 10 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-9
-- merge up to latest yum head - sort of a pre 3.2.22
-
-* Wed Feb  4 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-8
-- fix for YumHeaderPackages so it plays nicely w/createrepo and mergerepo, etc
-
-* Thu Jan 29 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-7
-- update HEAD patch to fix repodiff (and EVR comparisons in certain cases)
-
-* Tue Jan 27 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-6
-- patch to keep anaconda (and other callers) happy
-- remove old 6hr patch which is now upstream
-
-* Mon Jan 26 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-4
-- patch to latest HEAD to test a number of fixes for alpha
-
-* Tue Jan 20 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-3
-- add a small patch to make things play a bit nicer with the logging module
-  in 2.6
-
-
-* Wed Jan  7 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.21-1
-- bump to 3.2.21
-
-* Thu Dec 18 2008 James Antill <james@fedoraproject.org> - 3.2.20-8
-- merge latest from upstream
-- move to 6hr metadata
-
-* Mon Dec  8 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.20-7
-- merge patch from upstream and remove now old obsoletes patch
-
-* Thu Dec 04 2008 Jesse Keating <jkeating@redhat.com> - 3.2.20-6
-- Add patch from upstream to fix cases where obsoletes are disabled. (jantill)
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 3.2.20-5
-- Rebuild for Python 2.6
-
-* Wed Nov 26 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.20-4
-- update head patch
-
-* Wed Oct 29 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.20-3
-- full patch against HEAD for skipbroken fixes (among others)
-
-* Mon Oct 27 2008 James Antill <james@fedoraproject.org> - 3.2.20-2
-- Fix listTransaction for skipped packages.
-
-* Mon Oct 27 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.20-1
-- 3.2.20
-
-* Thu Oct 23 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.19-6
-- update HEAD patch
-
-* Wed Oct 15 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.19-5
-- rebase against 3.2.X HEAD
-
-* Tue Oct 14 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.19-4
-- pull patch from git to bring us up to current(ish)
-
-* Wed Sep  3 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.19-3
-- add patch to fix yum install name.arch matching
-
-* Thu Aug 28 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.19-2
-- add patch to fix mash's parser use.
-
-* Wed Aug 27 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.19-1
-- 3.2.19
-
-* Thu Aug  7 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.18-1
-- 3.2.18
-
-* Wed Jul 10 2008 Seth Vidal <skvidal@fedoraproject.org> - 3.2.17-2
-- add patch from upstream for bug in compare_providers
-
-* Wed Jul  9 2008 Seth Vidal <skvidal@fedoraproject.org> - 3.2.17-1
-- 3.2.17
-
-* Tue Jun 24 2008 Jesse Keating <jkeating@redhat.com> - 3.2.16-4
-- Add a couple more upstream patches for even more multilib fixes
-
-* Tue Jun 24 2008 Jesse Keating <jkeating@redhat.com> - 3.2.16-3
-- Add another patch from upstream for multilib policy and noarch
-
-* Sun May 18 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.16-2
-- stupid, stupid, stupid
-
-
-* Fri May 16 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.16-1
-- 3.2.16
-
-* Tue Apr 15 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-9
-- nine is the luckiest number that there will ever be
-
-* Tue Apr 15 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-8
-- after many tries - this one fixes translations AND pungi
-
-* Thu Apr 10 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-5
-- once more, with feeling
-
-* Thu Apr 10 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-4
-- another big-head-patch
-
-* Wed Apr  9 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-3
-- apply patch to bring this up to where HEAD is now.
-
-* Tue Apr  8 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.14-1
-- remove committed patch
-- obsoletes yum-basearchonly
-
-* Tue Apr  1 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.13-2
-- fix minor typo in comps.py for jkeating
-
-* Thu Mar 20 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.13-1
-- 3.2.13
-
-* Mon Mar 17 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.12-5
-- update manpage patch to close bug 437703. Thakns to Kulbir Saini for the patch
-
-
-* Fri Mar 14 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.12-4
-- multilib_policy=best is  now the default
-
-* Thu Mar 13 2008 Seth Vidal <skvidal at fedoraproject.org> 
-- add jeff sheltren's patch to close rh bug 428825
-
-* Tue Mar  4 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.12-3
-- set failovermethod to 'priority' to make jkeating happy
-
-* Tue Mar  4 2008 Seth Vidal <skvidal at fedoraproject.org> 3.2.12-2
-- fix mutually obsoleting providers (like glibc!)
-
-* Mon Mar  3 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.12-1
-- 3.2.12
-
-* Fri Feb  8 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.11-1
-- 3.2.11
-
-* Sun Jan 27 2008 James Bowes <jbowes@redhat.com> 3.2.10-3
-- Remove yumupd.py
-
-* Fri Jan 25 2008 Seth Vidal <skvidal at fedoraproject.org> - 3.2.10-1
-- 3.2.10
-- add pygpgme dep
-