--- rpm-4.2.3/lib/transaction.c.no-doc-conflicts	2005-01-13 05:56:03.000000000 -0500
+++ rpm-4.2.3/lib/transaction.c	2005-03-10 08:19:48.216589902 -0500
@@ -179,6 +179,26 @@ static int handleInstInstalledFiles(cons
 		}
 	    }
 
+	    /* HACK: always install latest (arch-independent) man
+	       pages and gtk/gnome html doc files. */
+	    if (rConflicts && tscolor != 0 && FColor == 0 && oFColor == 0) {
+		const char *ignorelist[] = {
+		    "/usr/share/man/",
+		    "/usr/share/gtk-doc/html/",
+		    "/usr/share/gnome/html/",
+		    NULL
+		};
+		const char *fn = rpmfiFN(fi);
+		const char **dnp;
+		for (dnp = ignorelist; *dnp != NULL; dnp++) {
+		    if (strstr(fn, *dnp) == fn) {
+			fi->actions[fileNum] = FA_CREATE;
+			rConflicts = 0;
+			break;
+		    }
+		}
+	    }
+
 	    if (rConflicts) {
 		rpmpsAppend(ps, RPMPROB_FILE_CONFLICT,
 			rpmteNEVR(p), rpmteKey(p),