diff --git a/package/base/python/dont-force-rebuild-all.patch b/package/base/python/dont-force-rebuild-all.patch index 01d38a36c..2a986fccb 100644 --- a/package/base/python/dont-force-rebuild-all.patch +++ b/package/base/python/dont-force-rebuild-all.patch @@ -1,29 +1,6 @@ -# --- 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 - 2004 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 --- - -Forcing rebuild of site-package files results in shared files. - - - Rene Rebe - ---- ./Makefile.pre.in.orig 2003-11-12 11:31:18.721639608 +0100 -+++ ./Makefile.pre.in 2003-11-12 11:31:55.176097688 +0100 -@@ -703,19 +703,19 @@ +--- ./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 @@ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ @@ -35,12 +12,12 @@ Forcing rebuild of site-package files results in shared files. - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -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) \ + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ + -d $(LIBDEST)/site-packages \ diff --git a/package/base/python/python-setup.patch b/package/base/python/python-setup.patch index fc71c494a..446a72f9b 100644 --- a/package/base/python/python-setup.patch +++ b/package/base/python/python-setup.patch @@ -1,25 +1,6 @@ -# --- 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/python-setup.patch -# ROCK Linux is Copyright (C) 1998 - 2004 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 --- - ---- ./Modules/Setup.dist.orig Thu Aug 8 21:52:42 2002 -+++ ./Modules/Setup.dist Fri Jan 10 20:01:20 2003 -@@ -130,7 +130,7 @@ +--- ./Modules/Setup.dist.orig 2004-12-09 02:31:09.905092984 +0100 ++++ ./Modules/Setup.dist 2004-12-09 02:36:59.073011392 +0100 +@@ -147,7 +147,7 @@ # modules are to be built as shared libraries (see above for more # detail; also note that *static* reverses this effect): @@ -28,9 +9,7 @@ # GNU readline. Unlike previous Python incarnations, GNU readline is # now incorporated in an optional module, configured in the Setup file ---- ./Modules/Setup.dist.orig Thu Aug 23 03:24:42 2001 -+++ ./Modules/Setup.dist Thu Oct 4 08:33:35 2001 -@@ -136,7 +136,7 @@ +@@ -157,7 +157,7 @@ # it, depending on your system -- see the GNU readline instructions. # It's okay for this to be a shared library, too. @@ -39,9 +18,9 @@ # Modules that should always be present (non UNIX dependent): -@@ -177,25 +177,25 @@ +@@ -197,25 +197,25 @@ - # Socket module compiled with SSL support; you must comment out the other + # Socket module helper for SSL support; you must comment out the other # socket line above, and possibly edit the SSL variable: -#SSL=/usr/local/ssl -#_ssl _ssl.c \ @@ -72,39 +51,28 @@ # Multimedia modules -- off by default. -@@ -231,8 +231,8 @@ - # FTP archive sites. One URL for it is: - # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z +@@ -336,7 +336,7 @@ + # -lX11 --#GMP=/ufs/guido/src/gmp --#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a -+#GMP=/usr -+#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a - - - # SGI IRIX specific modules -- off by default. -@@ -333,7 +333,7 @@ - # Lance Ellinghaus's modules: - - #rotor rotormodule.c # enigma-inspired encryption + # Lance Ellinghaus's syslog module -#syslog syslogmodule.c # syslog daemon interface +syslog syslogmodule.c # syslog daemon interface # Curses support, requring the System V version of curses, often -@@ -376,7 +376,7 @@ +@@ -378,7 +378,7 @@ # # First, look at Setup.config; configure may have set this for you. -#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm -+gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm ++gdbm gdbmmodule.c -I/usr/include -L/usr/lib -lgdbm - # Berkeley DB interface. -@@ -432,7 +432,7 @@ + # Sleepycat Berkeley DB interface. +@@ -442,7 +442,7 @@ # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). - # See http://www.cdrom.com/pub/infozip/zlib/ + # See http://www.gzip.org/zlib/ -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz diff --git a/package/base/python/python.desc b/package/base/python/python.desc index feb41bbe5..77a7c7111 100644 --- a/package/base/python/python.desc +++ b/package/base/python/python.desc @@ -36,8 +36,8 @@ [L] OpenSource [S] Stable -[V] 2.3.4 +[V] 2.4 [P] X -?---5---9 124.100 -[D] 957588402 Python-2.3.4.tar.bz2 ftp://ftp.python.org/pub/python/2.3.4/ +[D] 592612117 Python-2.4.tar.bz2 ftp://ftp.python.org/pub/python/2.4/