From a26039b78a04745cf32496bf27407494fa446119 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 22 Aug 2013 11:01:45 +0200 Subject: [PATCH] python: Updated (2.7.3 -> 2.7.5) --- python/python/dont-force-rebuild-all.patch | 20 +++++++++---------- ...-2.7-no-autoconf-version-restriction.patch | 6 +++--- python/python/python-setup.patch | 14 ++++++------- python/python/python.desc | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/python/python/dont-force-rebuild-all.patch b/python/python/dont-force-rebuild-all.patch index 0c67430c4..6d9b5eb78 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 - 2011 The OpenSDE Project +# Copyright (C) 2009 - 2013 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -16,31 +16,31 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- 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 +--- Python-2.7.5/Makefile.pre.in.orig 2013-08-22 10:39:56.378654799 +0200 ++++ Python-2.7.5/Makefile.pre.in 2013-08-22 10:42:59.134897090 +0200 +@@ -1002,21 +1002,21 @@ + fi PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ + -d $(LIBDEST)/site-packages \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ + $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ + -d $(LIBDEST)/site-packages \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" + $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt diff --git a/python/python/python-2.7-no-autoconf-version-restriction.patch b/python/python/python-2.7-no-autoconf-version-restriction.patch index 48586f547..594bf0b51 100644 --- a/python/python/python-2.7-no-autoconf-version-restriction.patch +++ b/python/python/python-2.7-no-autoconf-version-restriction.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../python/python-2.7-no-autoconf-version-restriction.patch -# Copyright (C) 2011 - 2012 The OpenSDE Project +# Copyright (C) 2011 - 2013 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -16,8 +16,8 @@ Description: Do not restrict the build system to autoconf 2.65 ---- Python-2.7.3/configure.in.orig 2012-04-10 01:07:36.000000000 +0200 -+++ Python-2.7.3/configure.in 2012-05-08 20:22:00.373393473 +0200 +--- Python-2.7.5/configure.ac.orig 2013-08-22 10:47:36.409313094 +0200 ++++ Python-2.7.5/configure.ac 2013-08-22 10:48:01.057917999 +0200 @@ -5,8 +5,6 @@ # Set VERSION so we only need to edit in one place (i.e., here) m4_define(PYTHON_VERSION, 2.7) diff --git a/python/python/python-setup.patch b/python/python/python-setup.patch index 1f415c7c6..1a413fb56 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 - 2011 The OpenSDE Project +# Copyright (C) 2008 - 2013 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -15,8 +15,8 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- 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 +--- Python-2.7.5/Modules/Setup.dist.orig 2013-05-12 05:32:49.000000000 +0200 ++++ Python-2.7.5/Modules/Setup.dist 2013-08-22 10:53:00.800796248 +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): @@ -26,12 +26,12 @@ # GNU readline. Unlike previous Python incarnations, GNU readline is # now incorporated in an optional module, configured in the Setup file -@@ -207,29 +207,29 @@ +@@ -211,29 +211,29 @@ #_csv _csv.c # Socket module helper for socket(2) --#_socket socketmodule.c -+_socket socketmodule.c +-#_socket socketmodule.c timemodule.c ++_socket socketmodule.c timemodule.c # Socket module helper for SSL support; you must comment out the other # socket line above, and possibly edit the SSL variable: @@ -64,7 +64,7 @@ # Multimedia modules -- off by default. -@@ -354,7 +354,7 @@ +@@ -358,7 +358,7 @@ # -lX11 # Lance Ellinghaus's syslog module diff --git a/python/python/python.desc b/python/python/python.desc index 8a83f83c8..7e4a601ed 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 - 2012 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2013 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.7.3 +[V] 2.7.5 [P] X ??---5---9 109.000 -[D] 135576085 Python-2.7.3.tar.bz2 http://www.python.org/ftp/python/2.7.3/ +[D] 2965619884 Python-2.7.5.tar.bz2 http://www.python.org/ftp/python/2.7.5/