python: Apply lib64 patches correctly on all 64 bit arches

diff --git a/python/patches/x86_64/python-2.7-lib64-sysconfig.patch b/python/python-2.7-lib64-sysconfig.patch
similarity index 100%
rename from python/patches/x86_64/python-2.7-lib64-sysconfig.patch
rename to python/python-2.7-lib64-sysconfig.patch

diff --git a/python/patches/x86_64/python-2.7.3-lib64.patch b/python/python-2.7.3-lib64.patch
similarity index 100%
rename from python/patches/x86_64/python-2.7.3-lib64.patch
rename to python/python-2.7.3-lib64.patch

diff --git a/python/python.nm b/python/python.nm
index 52adcebdeae88b3cf056f20232193ec73d0b85f9..84704b5b465812235c7245374be1fcf92d0a73ac 100644 (file)
--- a/python/python.nm
+++ b/python/python.nm
@@ -6,7 +6,7 @@
 name       = python
 major_ver  = 2.7
 version    = %{major_ver}.5
-release    = 1
+release    = 2
 thisapp    = Python-%{version}
 
 groups     = Development/Languages
@@ -47,6 +47,13 @@ build
        end
 
        export CFLAGS  += -D_GNU_SOURCE -fwrapv
+       export CPPFLAGS = %(pkg-config --cflags-only-I libffi)
+       export OPT      = %{CFLAGS}
+
+       if "%{lib}" == "lib64"
+               patches += %{DIR_SOURCE}/python-2.7.3-lib64.patch
+               patches += %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch
+       end
 
        prepare_cmds
                # Remove embedded copies of expat, zlib and libffi
@@ -64,16 +71,6 @@ build
                --with-system-ffi \
                --enable-shared
 
-       build
-               export CPPFLAGS=$(pkg-config --cflags-only-I libffi)
-
-               OPT="%{CFLAGS}" \
-                       ./configure \
-                               %{configure_options}
-
-               make %{PARALLELISMFLAGS}
-       end
-
        test
                WITHIN_PYTHON_RPM_BUILD= EXTRATESTOPTS="--verbose" make test || :
        end