diff --git a/python/python/dont-force-rebuild-all.patch b/python/python/dont-force-rebuild-all.patch index ccdfddf3c..0c67430c4 100644 --- a/python/python/dont-force-rebuild-all.patch +++ b/python/python/dont-force-rebuild-all.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../python/dont-force-rebuild-all.patch -# Copyright (C) 2009 The OpenSDE Project +# Copyright (C) 2009 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -16,20 +16,22 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./Makefile.pre.in.orig 2009-02-07 20:53:36.000000000 +0200 -+++ ./Makefile.pre.in 2009-02-07 20:58:09.000000000 +0200 -@@ -880,19 +880,19 @@ +--- Python-2.7.1/Makefile.pre.in.orig 2010-10-14 13:37:30.000000000 +0200 ++++ Python-2.7.1/Makefile.pre.in 2011-04-25 13:05:34.852077820 +0200 +@@ -922,21 +922,21 @@ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ - -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ + $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ - -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ + $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ diff --git a/python/python/dont-rebuild-with-equal-time.patch b/python/python/dont-rebuild-with-equal-time.patch.disabled similarity index 96% rename from python/python/dont-rebuild-with-equal-time.patch rename to python/python/dont-rebuild-with-equal-time.patch.disabled index a3228a211..1bb0597e4 100644 --- a/python/python/dont-rebuild-with-equal-time.patch +++ b/python/python/dont-rebuild-with-equal-time.patch.disabled @@ -1,7 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../python/dont-rebuild-with-equal-time.patch +# Filename: package/.../python/dont-rebuild-with-equal-time.patch.disabled +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # diff --git a/python/python/python-2.5-cross-printf.patch b/python/python/python-2.5-cross-printf.patch.disabled similarity index 93% rename from python/python/python-2.5-cross-printf.patch rename to python/python/python-2.5-cross-printf.patch.disabled index 017e3d450..cd338a0bb 100644 --- a/python/python/python-2.5-cross-printf.patch +++ b/python/python/python-2.5-cross-printf.patch.disabled @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../python/python-2.5-cross-printf.patch -# Copyright (C) 2009 The OpenSDE Project +# Filename: package/.../python/python-2.5-cross-printf.patch.disabled +# Copyright (C) 2009 - 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. # diff --git a/python/python/python-setup.patch b/python/python/python-setup.patch index a6c3820fa..1f415c7c6 100644 --- a/python/python/python-setup.patch +++ b/python/python/python-setup.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../python/python-setup.patch -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2008 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -14,9 +14,10 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./Modules/Setup.dist.orig 2005-04-20 09:18:35.000000000 +0200 -+++ ./Modules/Setup.dist 2005-04-20 09:24:02.000000000 +0200 -@@ -147,7 +147,7 @@ + +--- Python-2.7.1/Modules/Setup.dist.orig 2011-04-25 13:17:44.036078049 +0200 ++++ Python-2.7.1/Modules/Setup.dist 2011-04-25 13:24:05.804077819 +0200 +@@ -153,7 +153,7 @@ # modules are to be built as shared libraries (see above for more # detail; also note that *static* reverses this effect): @@ -25,7 +26,12 @@ # GNU readline. Unlike previous Python incarnations, GNU readline is # now incorporated in an optional module, configured in the Setup file -@@ -201,25 +201,25 @@ +@@ -207,29 +207,29 @@ + #_csv _csv.c + + # Socket module helper for socket(2) +-#_socket socketmodule.c ++_socket socketmodule.c # Socket module helper for SSL support; you must comment out the other # socket line above, and possibly edit the SSL variable: @@ -58,7 +64,7 @@ # Multimedia modules -- off by default. -@@ -340,7 +340,7 @@ +@@ -354,7 +354,7 @@ # -lX11 # Lance Ellinghaus's syslog module diff --git a/python/python/python.desc b/python/python/python.desc index 5e78b4714..5a4e985ec 100644 --- a/python/python/python.desc +++ b/python/python/python.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../python/python.desc -[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -28,7 +28,7 @@ [L] OpenSource [S] Stable -[V] 2.6.6 +[V] 2.7.1 [P] X ??---5---9 109.000 -[D] 771068759 Python-2.6.6.tar.bz2 http://www.python.org/ftp/python/2.6.6/ +[D] 285256225 Python-2.7.1.tar.bz2 http://www.python.org/ftp/python/2.7.1/