RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 26-Dec-2010 22:34:07
Branch: rpm-5_3 Handle: 2010122621340600
Modified files: (Branch: rpm-5_3)
rpm/lib transaction.c
Log:
(patch commited to rpm-5_2 in past, need closer review later, cooker
packaging
might just as well require to be fixed with in stead/addition..)
# don't conflict for doc files from colored packages
# (to be able to install lib*-devel together with lib64*-devel even if they
have conflicting manpages)
# STATUS: uncertain about current relevance, or if we actaully still want
# files of different colors to conflict anymore...(?) previous decission
about
# forcing conflicts wasn't made with great convincement...
# One thing is for certain though, the directory specific parts of the hack
is
# certainly NOT upstream friendly...
Patch501: rpm-5.2-no-doc-conflicts.patch
Summary:
Revision Changes Path
1.428.2.3 +22 -0 rpm/lib/transaction.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.428.2.2 -r1.428.2.3 transaction.c
--- rpm/lib/transaction.c 16 Dec 2010 14:22:37 -0000 1.428.2.2
+++ rpm/lib/transaction.c 26 Dec 2010 21:34:06 -0000 1.428.2.3
@@ -117,6 +117,28 @@
}
}
+#if defined(RPM_VENDOR_MANDRIVA) /* no-doc-conflicts */
+ /* 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[fx] = FA_CREATE;
+ rConflicts = 0;
+ break;
+ }
+ }
+ }
+#endif
+
if (rConflicts) {
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmps ps = rpmtsProblems(ts);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
