From 75af02d305342a09befea3c21206bd981ebccfdf Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Apr 23 2007 18:55:55 +0000
Subject: - include the fix for comps files in extra repos with anaconda (#237546)


---

diff --git a/yum-misc-fixes.patch b/yum-misc-fixes.patch
index 7b4020d..5ccc504 100644
--- a/yum-misc-fixes.patch
+++ b/yum-misc-fixes.patch
@@ -2,10 +2,10 @@ Index: yum/__init__.py
 ===================================================================
 RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
 retrieving revision 1.317
-retrieving revision 1.319
-diff -u -r1.317 -r1.319
+retrieving revision 1.320
+diff -u -r1.317 -r1.320
 --- yum/__init__.py	8 Apr 2007 15:59:59 -0000	1.317
-+++ yum/__init__.py	18 Apr 2007 23:16:45 -0000	1.319
++++ yum/__init__.py	18 Apr 2007 23:38:02 -0000	1.320
 @@ -307,7 +307,7 @@
      def _getRepos(self, thisrepo=None, doSetup = False):
          """grabs the repomd.xml for each enabled repository and sets up 
@@ -25,7 +25,15 @@ diff -u -r1.317 -r1.319
          if self._pkgSack and thisrepo is None:
              self.verbose_logger.log(logginglevels.DEBUG_4,
                  'skipping reposetup, pkgsack exists')
-@@ -1767,8 +1764,16 @@
+@@ -429,6 +426,7 @@
+         warnings.warn('doGroupSetup() will go away in a future version of Yum.\n',
+                 Errors.YumFutureDeprecationWarning, stacklevel=2)
+ 
++        self.comps = None
+         return self._getGroups()
+ 
+     def _setGroups(self, val):
+@@ -1767,8 +1765,16 @@
                  pkgs = pkgSack.returnNewestByName()
                  del(pkgSack)
  
@@ -43,7 +51,7 @@ diff -u -r1.317 -r1.319
                  pkgs = lst
  
          if len(pkgs) == 0:
-@@ -1779,7 +1784,7 @@
+@@ -1779,7 +1785,7 @@
          # FIXME - lots more checking here
          #  - install instead of erase
          #  - better error handling/reporting
diff --git a/yum.spec b/yum.spec
index 154e0c4..0634767 100644
--- a/yum.spec
+++ b/yum.spec
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.1/%{name}-%{version}.tar.gz
@@ -121,6 +121,9 @@ exit 0
 
 
 %changelog
+* Mon Apr 23 2007 Jeremy Katz <katzj@redhat.com> - 3.1.6-3
+- include the fix for comps files in extra repos with anaconda (#237546)
+
 * Wed Apr 18 2007 Jeremy Katz <katzj@redhat.com> - 3.1.6-2
 - fix install with patterns (#236950)
 - fix multiple repos in anaconda (#231543)