[yum] deltarpm bugfixes

[Zdeněk Pavlas]

commit c900e5344fb2d5783435147cf9e83c9e63b59e22
Author: Zdenek Pavlas <zden3k at gmail.com>
Date:   Wed Feb 27 11:26:39 2013 +0100

    deltarpm bugfixes

 native-drpm-support.patch |   25 +++++++++++++++++++++++++
 yum.spec                  |    9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/native-drpm-support.patch b/native-drpm-support.patch
index 2b1cd71..7b3a80d 100644
--- a/native-drpm-support.patch
+++ b/native-drpm-support.patch
@@ -518,3 +518,28 @@ index 0000000..96a04fd
 +        self.wait(self.limit)
 +        pid = os.spawnl(os.P_NOWAIT, APPLYDELTA, APPLYDELTA, po.localpath, po.rpm.localpath)
 +        self.jobs[pid] = callback
+diff --git a/yum/__init__.py b/yum/__init__.py
+index 5ef710e..85bed4d 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -2267,7 +2267,7 @@ much more problems).
+                     presto.rebuild(po, adderror)
+                     continue
+                 deltasize += po.size
+-                rpmsize = po.rpm.size
++                rpmsize += po.rpm.size
+             remote_pkgs.append(po)
+             remote_size += po.size
+         if deltasize:
+diff --git a/yum/drpm.py b/yum/drpm.py
+index 96a04fd..4b63e5c 100644
+--- a/yum/drpm.py
++++ b/yum/drpm.py
+@@ -36,6 +36,7 @@ class DeltaPO:
+         self.repo = rpm.repo
+         self.basepath = rpm.basepath
+         self.pkgtup = rpm.pkgtup
++        self.getDiscNum = rpm.getDiscNum
+ 
+         # set up drpm attributes
+         self.size = size
diff --git a/yum.spec b/yum.spec
index 9658dcb..c0f7428 100644
--- a/yum.spec
+++ b/yum.spec
@@ -29,7 +29,7 @@
 Summary: RPM package installer/updater/manager
 Name: yum
 Version: 3.4.3
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -107,6 +107,8 @@ Provides: yum-plugin-protect-packages = 1.1.27-0.yum
 Obsoletes: yum-plugin-download-order <= 0.2-2
 Obsoletes: yum-plugin-downloadonly <= 1.1.31-7.fc18
 Provides: yum-plugin-downloadonly = 3.4.3-44.yum
+Obsoletes: yum-presto < 3.4.3-66.yum
+Provides: yum-presto = 3.4.3-66.yum
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -385,6 +387,11 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 27 2013 Zdeněk Pavlas <zpavlas at redhat.com> - 3.4.3-66
+- fixed getDiscNum bug
+- fixed rpmsize calculation
+- obsoleted yum-presto plugin
+
 * Tue Feb 26 2013 Zdeněk Pavlas <zpavlas at redhat.com> - 3.4.3-65
 - start downloading drpms before rpms
 - deactivate presto if deltarpm package is not installed