RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 03-Jul-2007 17:25:36 Branch: HEAD Handle: 2007070316253600 Modified files: rpm CHANGES rpm/lib rpmfc.c Log: lib32 is valid on MIPSn32 machines. So take this into account when working w/ usr/lib*/python identification. Summary: Revision Changes Path 1.1427 +1 -0 rpm/CHANGES 1.5 +2 -1 rpm/lib/rpmfc.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1426 -r1.1427 CHANGES --- rpm/CHANGES 2 Jul 2007 17:15:02 -0000 1.1426 +++ rpm/CHANGES 3 Jul 2007 15:25:36 -0000 1.1427 @@ -1,4 +1,5 @@ 4.5 -> 5.0: + - mgh: add lib32 as a valid directory in rpmfc - mgh: change uses of @USRLIBRPM@ to %{_usrlibrpm} (needed for runtime relocation) - mgh: ensure the rpm python module is linked the same as the rest of RPM - rse: prune the 23MB large db/docs/ third-party subtree to no longer ship it in RPM distribution tarballs. @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.c ============================================================================ $ cvs diff -u -r1.4 -r1.5 rpmfc.c --- rpm/lib/rpmfc.c 27 Jun 2007 21:05:07 -0000 1.4 +++ rpm/lib/rpmfc.c 3 Jul 2007 15:25:36 -0000 1.5 @@ -894,7 +894,8 @@ { const char *fn = strstr(fc->fn[fc->ix], "/usr/lib"); if (fn) { fn += sizeof("/usr/lib")-1; - if (fn[0] == '6' && fn[1] == '4') + if ((fn[0] == '3' && fn[1] == '2') || + (fn[0] == '6' && fn[1] == '4')) fn += 2; if (!strncmp(fn, "/python", sizeof("/python")-1)) fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org