From 73fb1d72355a5defacb8bd388afd5c13245b38f8 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Wed, 12 May 1999 20:24:00 +0000
Subject: [PATCH] fix: shared file not skipped when removed.

CVS patchset: 3059
CVS date: 1999/05/12 20:24:00
---
 CHANGES           | 1 +
 lib/transaction.c | 2 +-
 po/rpm.pot        | 8 ++++----
 rpm.spec          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index b488eed9e..5f85ccec1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@
 	- fix: resurrect -Vp, -Vf and -Vg functionality.
 	- colesce query and verify modes.
 	- better cpio error message if package contains missing hard links.
+	- fix: shared file not skipped when removed.
 
 2.94 -> 2.95
 	- fix: last update transaction set segfault bug in installer.
diff --git a/lib/transaction.c b/lib/transaction.c
index 37b2c6425..69eed5075 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1092,7 +1092,7 @@ static int handleRmvdInstalledFiles(struct fileInfo * fi, rpmdb db,
 	otherFileNum = shared->otherFileNum;
 	fileNum = shared->pkgFileNum;
 
-	if (otherStates[fileNum] == RPMFILE_STATE_NORMAL)
+	if (otherStates[otherFileNum] == RPMFILE_STATE_NORMAL)
 	    fi->actions[fileNum] = FA_SKIP;
     }
 
diff --git a/po/rpm.pot b/po/rpm.pot
index 3b9015bc6..64590d4e3 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-05-11 15:50-0400\n"
+"POT-Creation-Date: 1999-05-12 16:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3263,17 +3263,17 @@ msgstr ""
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: ../lib/transaction.c:793
+#: ../lib/transaction.c:795
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: ../lib/transaction.c:799
+#: ../lib/transaction.c:801
 #, c-format
 msgid "excluding %s\n"
 msgstr ""
 
-#: ../lib/transaction.c:887
+#: ../lib/transaction.c:889
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index ca69603cd..164090a8f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.1
 Version: %{version}
-Release: 8
+Release: 9
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL