From 9c1041ff964d643a0c455b899ef2b62b91b8c332 Mon Sep 17 00:00:00 2001
From: pawelk <pawelk@pld-linux.org>
Date: Sun, 17 Jun 2001 18:22:55 +0000
Subject: [PATCH] add field byKey tp dependencyConflict structure rel: 19 stbr

Changed files:
    rpm-byKey.patch -> 1.1
    rpm.spec -> 1.208
---
 rpm-byKey.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 rpm.spec        |  4 +++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 rpm-byKey.patch

diff --git a/rpm-byKey.patch b/rpm-byKey.patch
new file mode 100644
index 0000000..b143d01
--- /dev/null
+++ b/rpm-byKey.patch
@@ -0,0 +1,47 @@
+--- ./lib/rpmlib.h.org	Sun Jun 17 13:38:45 2001
++++ ./lib/rpmlib.h	Sun Jun 17 13:37:38 2001
+@@ -764,6 +764,7 @@
+     const char * byName;
+     const char * byVersion;
+     const char * byRelease;
++    const void * byKey;
+     Header byHeader;
+     /* these needs fields are misnamed -- they are used for the package
+        which isn't needed as well */
+--- ./lib/depends.c.org	Sun Jun 17 13:38:59 2001
++++ ./lib/depends.c	Sun Jun 17 13:36:56 2001
+@@ -1250,7 +1250,7 @@
+ }
+ 
+ static int checkPackageDeps(rpmTransactionSet ts, struct problemsSet * psp,
+-		Header h, const char * keyName, uint_32 multiLib)
++		Header h, const char * keyName, uint_32 multiLib, void *key)
+ {
+     const char * name, * version, * release;
+     const char ** requires;
+@@ -1311,6 +1311,7 @@
+ 	    psp->problems[psp->num].byName = xstrdup(name);
+ 	    psp->problems[psp->num].byVersion = xstrdup(version);
+ 	    psp->problems[psp->num].byRelease = xstrdup(release);
++	    psp->problems[psp->num].byKey = key;
+ 	    psp->problems[psp->num].needsName = xstrdup(requires[i]);
+ 	    psp->problems[psp->num].needsVersion = xstrdup(requiresEVR[i]);
+ 	    psp->problems[psp->num].needsFlags = requireFlags[i];
+@@ -1431,7 +1432,7 @@
+ 
+     rpmdbPruneIterator(mi, ts->removedPackages, ts->numRemovedPackages, 1);
+     while ((h = rpmdbNextIterator(mi)) != NULL) {
+-	if (checkPackageDeps(ts, psp, h, key, 0)) {
++	if (checkPackageDeps(ts, psp, h, key, 0,NULL)) {
+ 	    rc = 1;
+ 	    break;
+ 	}
+@@ -1995,7 +1996,7 @@
+     for (i = 0, p = ts->addedPackages.list; i < npkgs; i++, p++)
+     {
+ 
+-	rc = checkPackageDeps(ts, &ps, p->h, NULL, p->multiLib);
++	rc = checkPackageDeps(ts, &ps, p->h, NULL, p->multiLib,p->key);
+ 	if (rc)
+ 	    goto exit;
+ 
diff --git a/rpm.spec b/rpm.spec
index 2590e7f..49b09a0 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -3,7 +3,7 @@ Summary(de):	Red Hat (und jetzt auch PLD) Packet-Manager
 Summary(pl):	Aplikacja do zarz±dzania pakietami
 Name:		rpm
 Version:	4.0.2
-Release:	18
+Release:	19
 License:	GPL
 Group:		Base
 Group(de):	Gründsätzlich
@@ -36,6 +36,7 @@ Patch12:	%{name}-rh-lame.patch
 Patch13:	%{name}-glob.patch
 Patch14:	%{name}-header_h.patch	
 Patch15:	%{name}-fast-alAddPackage.patch
+Patch16:	%{name}-byKey.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires:	gettext-devel
@@ -217,6 +218,7 @@ construir pacotes usando o RPM.
 %patch11 -p0
 %patch12 -p0
 %patch15 -p0
+%patch16 -p0
 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 %patch38 -p1
-- 
2.43.0