diff --git a/package/base/python/curses_panel_hotfix.patch b/package/base/python/curses_panel_hotfix.patch deleted file mode 100644 index 178966eed..000000000 --- a/package/base/python/curses_panel_hotfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN Python-2.4.3-orig/Modules/_curses_panel.c Python-2.4.3/Modules/_curses_panel.c ---- Python-2.4.3-orig/Modules/_curses_panel.c 2006-03-07 14:39:26.000000000 +0100 -+++ Python-2.4.3/Modules/_curses_panel.c 2006-07-12 08:54:11.000000000 +0200 -@@ -14,7 +14,7 @@ static char *PyCursesVersion = "2.1"; - - #include "py_curses.h" - --#include -+#include - - static PyObject *PyCursesError; - diff --git a/package/base/python/dont-force-rebuild-all.patch b/package/base/python/dont-force-rebuild-all.patch index d04767423..c5d714ffb 100644 --- a/package/base/python/dont-force-rebuild-all.patch +++ b/package/base/python/dont-force-rebuild-all.patch @@ -1,36 +1,17 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/python/dont-force-rebuild-all.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./Makefile.pre.in.orig 2004-12-09 02:28:08.906608936 +0100 -+++ ./Makefile.pre.in 2004-12-09 02:29:16.036403656 +0100 -@@ -719,19 +719,19 @@ +--- ./Makefile.pre.in.orig 2006-12-08 21:46:13.000000000 +0100 ++++ ./Makefile.pre.in 2007-05-25 19:51:05.000000000 +0200 +@@ -774,19 +774,19 @@ $(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 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ diff --git a/package/base/python/python.conf b/package/base/python/python.conf index 3aab2187f..33e41f3e3 100644 --- a/package/base/python/python.conf +++ b/package/base/python/python.conf @@ -35,7 +35,7 @@ enable_tcltk() { } make_py_profile() { - echo "export LIBPYTHON='-lpython2.4$LIBS'" > $root/etc/profile.d/python + echo "export LIBPYTHON='-lpython2.5$LIBS'" > $root/etc/profile.d/python } export LIBS= @@ -47,4 +47,5 @@ confopt="$confopt --with-threads --enable-shared" # We can savely ignore this dependencies. var_append flistrfilter "|" ".*: /usr/lib/python.*/site-packages/.*" -versionhotfix 2.4.3 +versionhotfix 2.5.1 + diff --git a/package/base/python/python.desc b/package/base/python/python.desc index 3273c9f9a..371ea8d69 100644 --- a/package/base/python/python.desc +++ b/package/base/python/python.desc @@ -36,10 +36,10 @@ [L] OpenSource [S] Stable -[V] 2.4.3 +[V] 2.5.1 [P] X -?---5---9 122.400 -[D] 3497946814 Python-2.4.3.tar.bz2 http://www.python.org/ftp/python/2.4.3/ +[D] 1342971328 Python-2.5.1.tar.bz2 http://www.python.org/ftp/python/2.5.1/ [CV-URL] http://www.python.org/download/