From 1802011e05e4b568da3eca36bc2a2f2a28a4847f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 27 Oct 2012 11:49:44 +0200 Subject: [PATCH] python: Move arch-dependent patches into own directory. Also require glibc with RPC enabled. --- .../x86_64}/python-2.7-lib64-sysconfig.patch | 0 python/{ => patches/x86_64}/python-2.7.3-lib64.patch | 0 python/python.nm | 11 +++-------- 3 files changed, 3 insertions(+), 8 deletions(-) rename python/{ => patches/x86_64}/python-2.7-lib64-sysconfig.patch (100%) rename python/{ => patches/x86_64}/python-2.7.3-lib64.patch (100%) diff --git a/python/python-2.7-lib64-sysconfig.patch b/python/patches/x86_64/python-2.7-lib64-sysconfig.patch similarity index 100% rename from python/python-2.7-lib64-sysconfig.patch rename to python/patches/x86_64/python-2.7-lib64-sysconfig.patch diff --git a/python/python-2.7.3-lib64.patch b/python/patches/x86_64/python-2.7.3-lib64.patch similarity index 100% rename from python/python-2.7.3-lib64.patch rename to python/patches/x86_64/python-2.7.3-lib64.patch diff --git a/python/python.nm b/python/python.nm index d5c1a2d7b..8aff9240d 100644 --- a/python/python.nm +++ b/python/python.nm @@ -6,7 +6,7 @@ name = python major_ver = 2.7 version = %{major_ver}.3 -release = 1 +release = 2 thisapp = Python-%{version} groups = Development/Languages @@ -32,11 +32,12 @@ build bzip2-devel db4-devel >= 1:4.8 expat-devel + glibc-headers >= 2.16-4 libffi-devel libselinux-devel ncurses-devel openssl-devel - pkg-config + pakfire-builder >= 0.9.23-4 readline-devel sqlite-devel tar @@ -46,12 +47,6 @@ build export CFLAGS += -D_GNU_SOURCE -fwrapv prepare_cmds - # Apply patches for x86_64. - if [ "$(uname -m)" = "x86_64" ]; then - patch -Np1 -i %{DIR_SOURCE}/python-2.7.3-lib64.patch - patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch - fi - # Remove embedded copies of expat, zlib and libffi rm -rf Modules/{expat,zlib} rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} -- 2.39.5