From bf74b8fbf6133f590ef8918dd3e0490e1c112ce1 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sat, 10 Jan 2004 00:00:57 +0000 Subject: [PATCH] fixed python to not rebuild files with equal time-stamp - this is e.g. the case for paragui git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2163 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../base/python/dont-force-rebuild-all.patch | 23 +++++++++++++ package/base/python/python-setup.patch | 17 ++++------ package/base/python/python.cache | 2 +- package/base/python/python.conf | 5 ++- package/base/python/python.desc | 2 +- .../python/readline-prototypes.patch.disabled | 33 ------------------- 6 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 package/base/python/readline-prototypes.patch.disabled diff --git a/package/base/python/dont-force-rebuild-all.patch b/package/base/python/dont-force-rebuild-all.patch index 811382a7e..203691166 100644 --- a/package/base/python/dont-force-rebuild-all.patch +++ b/package/base/python/dont-force-rebuild-all.patch @@ -1,3 +1,26 @@ +# --- 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 @@ diff --git a/package/base/python/python-setup.patch b/package/base/python/python-setup.patch index f9c5f7d9b..fc71c494a 100644 --- a/package/base/python/python-setup.patch +++ b/package/base/python/python-setup.patch @@ -6,17 +6,14 @@ # 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 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# 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 --- diff --git a/package/base/python/python.cache b/package/base/python/python.cache index c2a0dda43..058e6dc14 100644 --- a/package/base/python/python.cache +++ b/package/base/python/python.cache @@ -6,7 +6,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/python/python.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/python/python.conf b/package/base/python/python.conf index 2f35d9f09..d49ef41f6 100644 --- a/package/base/python/python.conf +++ b/package/base/python/python.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/python/python.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,17 +20,16 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - # If this is enabled, the resulting python binary will not run without X11 # and Tcl/Tk. So there is no _tkinter module on default ... # enable_tcltk() { if [ -f /usr/include/tcl.h -a -f /usr/include/tk.h ] ; then + echo "Found tcl.h and tk.h: enabling tcltk support" { echo "_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \\" ; echo " -L/usr/X11R6/lib -I/usr/X11R6/include \\" ; echo " -ltk8.4 -ltcl8.4 -lX11" ; } >> Modules/Setup.local - echo "Found tcl.h and tk.h: enabling tcltk support" fi } diff --git a/package/base/python/python.desc b/package/base/python/python.desc index dab232430..cbd52cb03 100644 --- a/package/base/python/python.desc +++ b/package/base/python/python.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/python/python.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/python/readline-prototypes.patch.disabled b/package/base/python/readline-prototypes.patch.disabled deleted file mode 100644 index 6d519bc54..000000000 --- a/package/base/python/readline-prototypes.patch.disabled +++ /dev/null @@ -1,33 +0,0 @@ -# --- 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/readline-prototypes.patch.disabled -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- Modules/readline.c.orig Sun Jun 10 17:46:41 2001 -+++ Modules/readline.c Sun Jun 10 17:46:50 2001 -@@ -28,8 +28,6 @@ - #include /* You may need to add an -I option to Setup */ - - extern int rl_parse_and_bind(char *); --extern int rl_read_init_file(char *); --extern int rl_insert_text(char *); - extern int rl_bind_key(int, Function *); - extern int rl_bind_key_in_map(int, Function *, Keymap); - extern int rl_initialize(void);