From 7c3bfcdbdc997f3caa1336c15ff155a242d4441a Mon Sep 17 00:00:00 2001 From: Zdenek Pavlas Date: Jun 14 2013 07:21:30 +0000 Subject: DeltaPackage compat fix. BZ 974394 --- diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 0e50416..1e5f988 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -192721,10 +192721,10 @@ index 6d744c0..52b751b 100644 self.conflict = conflict # what the conflict was between them diff --git a/yum/drpm.py b/yum/drpm.py new file mode 100644 -index 0000000..b88d1ce +index 0000000..88e6a55 --- /dev/null +++ b/yum/drpm.py -@@ -0,0 +1,317 @@ +@@ -0,0 +1,320 @@ +# Integrated delta rpm support +# Copyright 2013 Zdenek Pavlas + @@ -192816,6 +192816,9 @@ index 0000000..b88d1ce + # hooray + return True + ++ def returnIdSum(self): ++ return self.csum ++ +def _num_cpus_online(unknown=1): + if not hasattr(os, "sysconf"): + return unknown diff --git a/yum.spec b/yum.spec index 1e326b9..3a21f77 100644 --- a/yum.spec +++ b/yum.spec @@ -41,7 +41,7 @@ BuildRequires: bash-completion Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 94%{?dist} +Release: 95%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz @@ -402,6 +402,9 @@ exit 0 %endif %changelog +* Fri Jun 14 2013 Zdenek Pavlas - 3.4.3-95 +- DeltaPackage compat fix. BZ 974394 + * Wed Jun 12 2013 Zdenek Pavlas - 3.4.3-94 - Update to latest HEAD. - downloadonly: prefetch also pkg checksums. BZ 973380