[packages/rpm/x32] fix detect of python files on x32

[glen]

commit ea4ae9f05122c3652fecc93be6cff3f94f78b6a3
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 1 16:41:02 2015 +0200

    fix detect of python files on x32

 rpm.spec  |  2 +-
 x32.patch | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 5b5dc8d..2af3431 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.15
-Release:	13
+Release:	14
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
diff --git a/x32.patch b/x32.patch
index 773e383..2e92738 100644
--- a/x32.patch
+++ b/x32.patch
@@ -12,7 +12,7 @@
  alpha*)		RPMCANONARCH=alpha ;;
  sparc64*)	RPMCANONARCH=sparc64 ;;
  sparc*)		RPMCANONARCH=sparc ;;
---- rpm-5.4.15/lib/rpmfc.c.orig	2014-12-20 16:50:32.000000000 +0100
+--- rpm-5.4.15/lib/rpmfc.c	2015-03-01 16:37:00.077437385 +0200
 +++ rpm-5.4.15/lib/rpmfc.c	2014-12-20 18:32:11.641808153 +0100
 @@ -581,6 +581,7 @@
    { "MIPS, N32 MIPS32",		RPMFC_ELFMIPSN32|RPMFC_INCLUDE },
@@ -35,6 +35,24 @@
  	if (fcolor & RPMFC_INCLUDE)
  	    return fcolor;
      }
+@@ -1148,7 +1153,7 @@
+     /* Generate package and per-file dependencies. */
+     for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
+ 
+-	/* XXX Insure that /usr/{share,lib{,64}}/python files are marked RPMFC_PYTHON */
++	/* XXX Insure that /usr/{share,lib{,64,x32}}/python files are marked RPMFC_PYTHON */
+ 	/* XXX HACK: classification by path is intrinsically stupid. */
+ 	{   fn = strstr(fc->fn[fc->ix], "/usr/lib");
+ 	    if (fn) {
+@@ -1156,6 +1161,8 @@
+ 		if ((fn[0] == '3' && fn[1] == '2') || 
+ 			(fn[0] == '6' && fn[1] == '4'))
+ 		    fn += 2;
++		if (fn[0] == 'x' && fn[1] == '3' && fn[2] == '2')
++		    fn += 3;
+ 		if (!strncmp(fn, "/python", sizeof("/python")-1))
+ 		    fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
+ 		else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
 --- rpm-5.4.15/lib/rpmfc.h.orig	2014-12-20 17:51:48.584934979 +0100
 +++ rpm-5.4.15/lib/rpmfc.h	2014-12-20 17:56:14.690160030 +0100
 @@ -20,8 +20,9 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/ea4ae9f05122c3652fecc93be6cff3f94f78b6a3