From 4beae6adb9349cc0b6d24c5e19ab5df18a0f0851 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 18 Nov 2009 10:46:22 +0000 Subject: [PATCH] Clifford Wolf: Subject: [PATCH 2/2] Updated Python (2.6.2) diff --git a/package/base/python/python.conf b/package/base/python/python.conf index 33e41f3..e42c9a2 100644 [2009072617540710209] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9488 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/python/python.conf | 26 +------------------------- package/base/python/python.desc | 4 ++-- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/package/base/python/python.conf b/package/base/python/python.conf index 33e41f3e3..e42c9a271 100644 --- a/package/base/python/python.conf +++ b/package/base/python/python.conf @@ -20,32 +20,8 @@ # # --- 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 - export LIBS="$LIBS -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11" - fi -} - -make_py_profile() { - echo "export LIBPYTHON='-lpython2.5$LIBS'" > $root/etc/profile.d/python -} - -export LIBS= -runpysetup=0 -preconf="enable_tcltk" -postmake="make_py_profile" -confopt="$confopt --with-threads --enable-shared" +runpysetup="0" # We can savely ignore this dependencies. var_append flistrfilter "|" ".*: /usr/lib/python.*/site-packages/.*" -versionhotfix 2.5.1 - diff --git a/package/base/python/python.desc b/package/base/python/python.desc index 8fb1a3ffb..6a380304b 100644 --- a/package/base/python/python.desc +++ b/package/base/python/python.desc @@ -36,10 +36,10 @@ [L] OpenSource [S] Stable -[V] 2.5.1 +[V] 2.6.2 [P] X --?--5---9 116.097 -[D] 1342971328 Python-2.5.1.tar.bz2 http://www.python.org/ftp/python/2.5.1/ +[D] 365861345 Python-2.6.2.tar.bz2 http://www.python.org/ftp/python/2.6.2/ [CV-URL] http://www.python.org/download/