sync with f12

diff --git a/sources b/sources
index d635ff8..3d1340f 100644 (file)
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3422c5d3997f7ab30df8c5735177cec7b5db32f  http://build.planet-lab.org/third-party/yum-3.2.27-2.fc12.src.rpm
+8c56687c99fb5dd93364c5dc211dc047595682d3  http://build.planet-lab.org/third-party/yum-3.2.27-3.fc12.src.rpm

diff --git a/yum.spec b/yum.spec
index e10ad7c..540dd67 100644 (file)
--- a/yum.spec
+++ b/yum.spec
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global release 3chroot
+%global release 4chroot
  
 Summary: RPM installer/updater
 Name: yum
@@ -19,6 +19,7 @@ Patch4: no-more-exactarchlist.patch
 Patch5: geode-arch.patch
 Patch6: yum-HEAD.patch
 Patch7: yum-do-not-overwrite-keys.patch
+Patch8: reget-metadata-size-fix.patch
 Patch10: yum-3.2.27-chroot.patch
 
 URL: http://yum.baseurl.org/
@@ -65,6 +66,7 @@ can notify you when they are available via email, syslog or dbus.
 %patch5 -p1
 #%%%%patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %patch10 -p1
 
@@ -117,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Thu Apr  8 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-3
+- fix regets on metadata when we run into an old file that's larger
+  than the new one
+
 * Tue Mar 23 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.27-2
 - broke searching in PK, this patch fixes it.