diff --git a/.gitignore b/.gitignore index c33d58f..c2cf9a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Python-2.7.tar.bz2 /Python-2.7.1.tar.bz2 +/Python-2.7.2.tar.bz2 diff --git a/python-2.7-autotool-intermediates.patch b/python-2.7-autotool-intermediates.patch index 6e1184e..68eefe9 100644 --- a/python-2.7-autotool-intermediates.patch +++ b/python-2.7-autotool-intermediates.patch @@ -1,14 +1,7 @@ diff -up ./configure.autotool-intermediates ./configure ---- ./configure.autotool-intermediates 2010-12-23 16:14:04.399059791 -0500 -+++ ./configure 2010-12-23 16:14:05.922060430 -0500 -@@ -1,5 +1,5 @@ - #! /bin/sh --# From configure.in Revision: 86043 . -+# From configure.in Revision: 86076 . - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.65 for python 2.7. - # -@@ -611,6 +611,8 @@ TRUE +--- ./configure.autotool-intermediates 2011-06-13 15:27:20.710308004 -0400 ++++ ./configure 2011-06-13 15:27:22.862308004 -0400 +@@ -619,6 +619,8 @@ TRUE MACHDEP_OBJS DYNLOADFILE DLINCLDIR @@ -17,7 +10,7 @@ diff -up ./configure.autotool-intermediates ./configure THREADOBJ LDLAST USE_THREAD_MODULE -@@ -631,6 +633,8 @@ OTHER_LIBTOOL_OPT +@@ -639,6 +641,8 @@ OTHER_LIBTOOL_OPT UNIVERSAL_ARCH_FLAGS BASECFLAGS OPT @@ -26,7 +19,7 @@ diff -up ./configure.autotool-intermediates ./configure LN INSTALL_DATA INSTALL_SCRIPT -@@ -748,8 +752,11 @@ with_pth +@@ -760,8 +764,11 @@ with_pth enable_ipv6 with_doc_strings with_tsc @@ -38,7 +31,17 @@ diff -up ./configure.autotool-intermediates ./configure with_wctype_functions with_fpectl with_libm -@@ -1422,8 +1429,11 @@ Optional Packages: +@@ -777,7 +784,8 @@ CFLAGS + LDFLAGS + LIBS + CPPFLAGS +-CPP' ++CPP ++CPPFLAGS' + + + # Initialize some variables set by options. +@@ -1435,8 +1443,11 @@ Optional Packages: --with-pth use GNU pth threading libraries --with(out)-doc-strings disable/enable documentation strings --with(out)-tsc enable/disable timestamp counter profile @@ -50,35 +53,7 @@ diff -up ./configure.autotool-intermediates ./configure --with-wctype-functions use wctype.h functions --with-fpectl enable SIGFPE catching --with-libm=STRING math library -@@ -1934,11 +1944,11 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $ac_includes_default -- enum { N = $2 / 2 - 1 }; - int - main () - { --static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; -+ 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; - test_array [0] = 0 - - ; -@@ -1949,11 +1959,11 @@ if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $ac_includes_default -- enum { N = $2 / 2 - 1 }; - int - main () - { --static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) -+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; -+ ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) - < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; - test_array [0] = 0 - -@@ -4739,7 +4749,7 @@ esac +@@ -4754,7 +4765,7 @@ esac $as_echo_n "checking LIBRARY... " >&6; } if test -z "$LIBRARY" then @@ -87,7 +62,7 @@ diff -up ./configure.autotool-intermediates ./configure fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5 $as_echo "$LIBRARY" >&6; } -@@ -4913,8 +4923,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> +@@ -4928,8 +4939,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> INSTSONAME="$LDLIBRARY".$SOVERSION ;; Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) @@ -98,7 +73,7 @@ diff -up ./configure.autotool-intermediates ./configure RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} case $ac_sys_system in FreeBSD*) -@@ -4937,7 +4947,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> +@@ -4952,7 +4963,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> ;; OSF*) LDLIBRARY='libpython$(VERSION).so' @@ -107,7 +82,7 @@ diff -up ./configure.autotool-intermediates ./configure RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ;; atheos*) -@@ -5318,6 +5328,14 @@ $as_echo "no" >&6; } +@@ -5391,6 +5402,14 @@ $as_echo "no" >&6; } fi @@ -122,7 +97,7 @@ diff -up ./configure.autotool-intermediates ./configure # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be # merged with this chunk of code? -@@ -9341,6 +9359,50 @@ $as_echo "no" >&6; } +@@ -9403,6 +9422,50 @@ $as_echo "no" >&6; } fi @@ -173,7 +148,7 @@ diff -up ./configure.autotool-intermediates ./configure # Check for Python-specific malloc support { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5 $as_echo_n "checking for --with-pymalloc... " >&6; } -@@ -9390,6 +9452,46 @@ fi +@@ -9452,6 +9515,46 @@ fi fi @@ -221,8 +196,8 @@ diff -up ./configure.autotool-intermediates ./configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wctype-functions" >&5 $as_echo_n "checking for --with-wctype-functions... " >&6; } diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in ---- ./pyconfig.h.in.autotool-intermediates 2010-12-23 16:14:04.396063268 -0500 -+++ ./pyconfig.h.in 2010-12-23 16:14:06.242367491 -0500 +--- ./pyconfig.h.in.autotool-intermediates 2011-06-13 15:27:20.702308004 -0400 ++++ ./pyconfig.h.in 2011-06-13 15:27:23.433308006 -0400 @@ -18,6 +18,12 @@ /* Define this if you have BeOS threads. */ #undef BEOS_THREADS @@ -249,3 +224,13 @@ diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in /* Define if you want pymalloc to be disabled when running under valgrind */ #undef WITH_VALGRIND +@@ -1146,6 +1146,9 @@ + /* This must be defined on some systems to enable large file support. */ + #undef _LARGEFILE_SOURCE + ++/* This must be defined on AIX systems to enable large file support. */ ++#undef _LARGE_FILES ++ + /* Define to 1 if on MINIX. */ + #undef _MINIX + diff --git a/python.spec b/python.spec index 0aa20c2..732a803 100644 --- a/python.spec +++ b/python.spec @@ -93,8 +93,8 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: -Version: 2.7.1 -Release: 9%{?dist} +Version: 2.7.2 +Release: 1%{?dist} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} @@ -390,16 +390,6 @@ Patch115: make-pydoc-more-robust-001.patch # For now, revert this patch: Patch121: python-2.7rc2-r79310.patch -# Fix race condition in parallel make that could lead to graminit.c failing -# to compile, or linker errors with "undefined reference to -# `_PyParser_Grammar'": -# Not yet sent upstream: -Patch122: python-2.7-fix-parallel-make.patch - -# test_commmands fails on SELinux systems due to a change in the output -# of "ls" (http://bugs.python.org/issue7108) -Patch124: fix-test_commands-expected-ls-output-issue7108.patch - # COUNT_ALLOCS is useful for debugging, but the upstream behaviour of always # emitting debug info to stdout on exit is too verbose and makes it harder to # use the debug build. Add a "PYTHONDUMPCOUNTS" environment variable which @@ -421,15 +411,6 @@ Patch127: fix-test_structmember-on-64bit-bigendian.patch # Not yet sent upstream Patch128: python-2.7.1-fix_test_abc_with_COUNT_ALLOCS.patch -# Use the correct preprocessor definition to detect ppc: -# See http://bugs.python.org/issue10655 and rhbz#661510 -Patch130: python-3.2b2-fix-ppc-debug-build.patch - -# Fix "import decimal" in the Turkish locale (rhbz#694928) -# Based on upstream commit: -# http://hg.python.org/cpython/rev/b4b1f557d563/ -Patch131: python-2.7.1-fix-decimal-in-turkish-locale.patch - # This is the generated patch to "configure"; see the description of # %{regenerate_autotooling_patch} @@ -675,14 +656,10 @@ rm -r Modules/zlib || exit 1 %patch115 -p0 %patch121 -p0 -R -%patch122 -p1 -b .fix-parallel-make -%patch124 -p1 %patch125 -p1 -b .less-verbose-COUNT_ALLOCS %patch126 -p0 -b .fix-dbm_contains-on-64bit-bigendian %patch127 -p0 -b .fix-test_structmember-on-64bit-bigendian %patch128 -p1 -%patch130 -p1 -%patch131 -p1 # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -1661,6 +1638,12 @@ rm -fr %{buildroot} # payload file would be unpackaged) %changelog +* Mon Jun 13 2011 David Malcolm - 2.7.2-1 +- 2.7.2; drop upstreamed patches: patch 122 (parallel make fix), patch 124 +(test_commands and SELinux), patch 130 (ppc preprocessor macro in debug +build); patch 131 (decimal in Turkish locale); regenerate the autotool +intermediates patch (patch 300) + * Tue Jun 07 2011 Dennis Gilmore - 2.7.1-9 - fix sparc building by excluding failing tests RHBZ#711584 diff --git a/sources b/sources index afab837..44a6a4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2 +ba7b2f11ffdbf195ee0d111b9455a5bd Python-2.7.2.tar.bz2