rpms
/
python2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

force sys.platform to be "linux2" (patch 145) 

* Wed Sep 14 2011 David Malcolm <dmalcolm@redhat.com> - 2.7.2-13
- force sys.platform to be "linux2" (patch 145)
This commit is contained in:
David Malcolm 2011-09-13 23:55:20 -04:00
parent 5764ad1aee
commit bc10ab792a
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
00145-force-sys-platform-to-be-linux2.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up Python-2.7.2/configure.in.linux2 Python-2.7.2/configure.in
--- Python-2.7.2/configure.in.linux2 2011-09-13 23:18:19.237252000 -0400
+++ Python-2.7.2/configure.in 2011-09-13 23:18:19.494252001 -0400
@@ -293,6 +293,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
diff -up Python-2.7.2/configure.linux2 Python-2.7.2/configure
--- Python-2.7.2/configure.linux2 2011-06-11 11:46:28.000000000 -0400
+++ Python-2.7.2/configure 2011-09-13 23:18:19.489252001 -0400
@@ -3003,6 +3003,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
diff -up Python-2.7.2/Misc/NEWS.linux2 Python-2.7.2/Misc/NEWS

22
python.spec
View File

@ -55,6 +55,9 @@
%global with_gdbm 0
# Turn this to 0 to turn off the "check" phase:
%global run_selftest_suite 1
# Some of the files below /usr/lib/pythonMAJOR.MINOR/test (e.g. bad_coding.py)
# are deliberately invalid, leading to SyntaxError exceptions if they get
# byte-compiled.
@ -73,6 +76,7 @@
# patch 4 (CFLAGS)
# patch 52 (valgrind)
# patch 55 (systemtap)
# patch 145 (linux2)
#
# For patch 55 (systemtap), we need to get a new header for configure to use
#
@ -104,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language
Name: %{python}
# Remember to also rebase python-docs when changing this:
Version: 2.7.2
Release: 12%{?dist}
Release: 13%{?dist}
License: Python
Group: Development/Languages
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@ -564,6 +568,13 @@ Patch143: 00143-tsc-on-ppc.patch
# (Optionally) disable the gdbm module:
Patch144: 00144-no-gdbm.patch
# Force MACHDEP and thus sys.platform to be "linux2" even on systems with
# linux 3, given that the distinction is meaningless (especially in Koji, where
# "uname" reflects the kernel running _outside_ the mock-provided chroot).
#
# Backport of part of fix for http://bugs.python.org/issue12326
Patch145: 00145-force-sys-platform-to-be-linux2.patch
# (New patches go here ^^^)
#
# When adding new patches to "python" and "python3" in Fedora 17 onwards,
@ -851,6 +862,7 @@ rm -r Modules/zlib || exit 1
%if !%{with_gdbm}
%patch144 -p1
%endif
%patch145 -p1 -b .linux2
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@ -1308,6 +1320,8 @@ CheckPython() {
}
%if 0%{run_selftest_suite}
# Check each of the configurations:
%if 0%{?with_debug_build}
CheckPython \
@ -1318,6 +1332,9 @@ CheckPython \
optimized \
python%{pybasever}
%endif # run_selftest_suite
# ======================================================
# Cleaning up
# ======================================================
@ -1679,6 +1696,9 @@ rm -fr %{buildroot}
# ======================================================
%changelog
* Wed Sep 14 2011 David Malcolm <dmalcolm@redhat.com> - 2.7.2-13
- force sys.platform to be "linux2" (patch 145)
* Tue Sep 13 2011 David Malcolm <dmalcolm@redhat.com> - 2.7.2-12
- disable gdbm module to prepare for gdbm soname bump