From 72c4c330fdce656ffc4899d7d74abf16bae7f56a Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 23 Sep 2003 10:28:37 +0000 Subject: [PATCH] "Stefan Paletta" : - upgrade to Python 2.3 and fix dependent packages I have a system running 2.3 since some weeks, these should be the remaining fixes; tested individually, not in a full rebuild. - bump linphone and mined version - another take at fixing libgnomedb / mergeant priority Speculative. - fix kdeartwork31 download git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1483 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/base/python/python.desc | 4 +-- package/base/rpm/rpm.conf | 2 ++ package/daniel/xchat/python-detection.patch | 27 +++++++++++++++++++ package/gnome2/libgnomedb08/libgnomedb08.desc | 2 +- package/gnome2/mergeant011/mergeant011.desc | 2 +- package/gnome2/svn-commit.tmp | 8 ++++++ package/gnome2/svnrename.sh | 14 ++++++++++ package/kasc/paragui/subconfig-libs.hlp | 2 +- package/kasc/paragui/subconfig-libs.in | 2 +- package/kde31/kdeartwork31/kdeartwork31.desc | 2 +- package/stefanp/linphone/linphone.desc | 4 +-- package/stefanp/mined/mined.desc | 4 +-- 13 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 package/daniel/xchat/python-detection.patch create mode 100644 package/gnome2/svn-commit.tmp create mode 100644 package/gnome2/svnrename.sh diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 8bf2db210..d230e1961 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -3,6 +3,7 @@ - Alejandro Mery: fixed ncurses: +x *.so and libcurses.a adde runit (sysvinit replacement) + - Stefan Paletta: updated python (2.3) and other stefanp repository updates *) 2003-09-21 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/base/python/python.desc b/package/base/python/python.desc index ca551a2ae..4c404a873 100644 --- a/package/base/python/python.desc +++ b/package/base/python/python.desc @@ -35,8 +35,8 @@ [L] OpenSource [S] Stable -[V] 2.2.3 +[V] 2.3 [P] X -----5---9 314.000 -[D] 4180771244 Python-2.2.3.tgz ftp://ftp.python.org/pub/python/2.2.3/ +[D] 3599657989 Python-2.3.tgz ftp://ftp.python.org/pub/python/2.3/ diff --git a/package/base/rpm/rpm.conf b/package/base/rpm/rpm.conf index 08a06fdf0..f7a68fbb9 100644 --- a/package/base/rpm/rpm.conf +++ b/package/base/rpm/rpm.conf @@ -28,3 +28,5 @@ main_rpm() { custmain="main_rpm" +var_append confopt " " "--with-python=2.3" + diff --git a/package/daniel/xchat/python-detection.patch b/package/daniel/xchat/python-detection.patch new file mode 100644 index 000000000..de665b1e6 --- /dev/null +++ b/package/daniel/xchat/python-detection.patch @@ -0,0 +1,27 @@ +--- xchat-2.0.4/configure.orig 2003-07-31 07:24:30.000000000 +0200 ++++ xchat-2.0.4/configure 2003-08-15 18:28:09.986630464 +0200 +@@ -23467,8 +23467,8 @@ + else + echo "$as_me:$LINENO: checking Python version" >&5 + echo $ECHO_N "checking Python version... $ECHO_C" >&6 +- PY_VERSION=`$pythonpath -c 'import sys; print sys.version[:3]'` +- PY_PATH=`$pythonpath -c 'import sys ; print sys.path[1][5:]'` ++ PY_VERSION=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_version()'` ++ PY_PATH=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1)'` + $pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)" + echo "$as_me:$LINENO: result: $PY_VERSION" >&5 + echo "${ECHO_T}$PY_VERSION" >&6 +@@ -23477,9 +23477,10 @@ + echo $ECHO_N "checking Python compile flags... $ECHO_C" >&6 + PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'` + PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'` +- if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then +- PY_LIBS="-L$PY_EXEC_PREFIX/$PY_PATH/config -lpython$PY_VERSION -lpthread -lutil" +- PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" ++PY_INCLUDE=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'` ++ if test -f $PY_INCLUDE/Python.h; then ++ PY_LIBS="-L$PY_PATH/config -lpython$PY_VERSION -lpthread -lutil" ++ PY_CFLAGS="-I$PY_INCLUDE" + echo "$as_me:$LINENO: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else diff --git a/package/gnome2/libgnomedb08/libgnomedb08.desc b/package/gnome2/libgnomedb08/libgnomedb08.desc index fce87f00e..952295e5a 100644 --- a/package/gnome2/libgnomedb08/libgnomedb08.desc +++ b/package/gnome2/libgnomedb08/libgnomedb08.desc @@ -35,7 +35,7 @@ [L] LGPL [S] Beta [V] 0.90.0 -[P] X -----5---9 521.999 +[P] X -----5---9 548.000 [D] 1897753874 libgnomedb-0.90.0.tar.gz ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/ diff --git a/package/gnome2/mergeant011/mergeant011.desc b/package/gnome2/mergeant011/mergeant011.desc index 06c715bfb..2f77f7cba 100644 --- a/package/gnome2/mergeant011/mergeant011.desc +++ b/package/gnome2/mergeant011/mergeant011.desc @@ -36,7 +36,7 @@ [L] LGPL [S] Beta [V] 0.12.1 -[P] X -----5---9 522.000 +[P] X -----5---9 548.500 [D] 2674599640 mergeant-0.12.1.tar.gz ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.12.1/ diff --git a/package/gnome2/svn-commit.tmp b/package/gnome2/svn-commit.tmp new file mode 100644 index 000000000..b847e8966 --- /dev/null +++ b/package/gnome2/svn-commit.tmp @@ -0,0 +1,8 @@ +final move +--This line, and those below, will be ignored-- + +D gucharmap +A gucharmap08 +A gucharmap08/gucharmap08.cache +A gucharmap08/gucharmap08.conf +A gucharmap08/gucharmap08.desc diff --git a/package/gnome2/svnrename.sh b/package/gnome2/svnrename.sh new file mode 100644 index 000000000..35b282840 --- /dev/null +++ b/package/gnome2/svnrename.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +for x in `(cd $1 ; ls $1.*)` ; do + svn mv $1/$x $1/${x/$1/$2} +done + +read in +svn commit $1 + +svn up $1 $2 + +svn mv $1 $2 +svn commit $1 $2 + diff --git a/package/kasc/paragui/subconfig-libs.hlp b/package/kasc/paragui/subconfig-libs.hlp index 866e6b523..a1f152f9f 100644 --- a/package/kasc/paragui/subconfig-libs.hlp +++ b/package/kasc/paragui/subconfig-libs.hlp @@ -14,7 +14,7 @@ ROCKCFG_PKG_PARAGUI_EXCEPTIONS compile with exception handling ROCKCFG_PKG_PARAGUI_PYTHON - create Python bindings + create Python bindings (currently broken with Python 2.3) ROCKCFG_PKG_PARAGUI_RUBY create Ruby bindings diff --git a/package/kasc/paragui/subconfig-libs.in b/package/kasc/paragui/subconfig-libs.in index 280d5bb28..87c1052ab 100644 --- a/package/kasc/paragui/subconfig-libs.in +++ b/package/kasc/paragui/subconfig-libs.in @@ -32,7 +32,7 @@ if pkgcheck paragui X ; then bool 'exceptions' ROCKCFG_PKG_PARAGUI_EXCEPTIONS 1 " compile with exception handling" if pkgcheck python X ; then - bool 'python bindings' ROCKCFG_PKG_PARAGUI_PYTHON 1 " + bool 'python bindings' ROCKCFG_PKG_PARAGUI_PYTHON 0 " create Python bindings" fi if pkgcheck ruby X ; then diff --git a/package/kde31/kdeartwork31/kdeartwork31.desc b/package/kde31/kdeartwork31/kdeartwork31.desc index 7fd25f5c3..726a7eb35 100644 --- a/package/kde31/kdeartwork31/kdeartwork31.desc +++ b/package/kde31/kdeartwork31/kdeartwork31.desc @@ -43,5 +43,5 @@ [V] 3.1.4 [P] X -----5---9 588.000 -[D] 13.1.42829 kdeartwork-3.1.4.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.4/src/ +[D] 3634391454 kdeartwork-3.1.4.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.4/src/ diff --git a/package/stefanp/linphone/linphone.desc b/package/stefanp/linphone/linphone.desc index da53fd915..84f7ae4b5 100644 --- a/package/stefanp/linphone/linphone.desc +++ b/package/stefanp/linphone/linphone.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 0.11.0 +[V] 0.12.0 [P] X -----5---9 883.000 -[D] 2965421497 linphone-0.11.0.tar.gz http://simon.morlat.free.fr/download/0.11.0/source/ +[D] 914126114 linphone-0.12.0.tar.gz http://simon.morlat.free.fr/download/0.12.0/source/ diff --git a/package/stefanp/mined/mined.desc b/package/stefanp/mined/mined.desc index daa445fee..cf0757182 100644 --- a/package/stefanp/mined/mined.desc +++ b/package/stefanp/mined/mined.desc @@ -44,8 +44,8 @@ [L] GPL [S] Stable -[V] 7 +[V] 8 [P] X -----5---9 866.000 -[D] 2727665242 mined-2000.7.tar.gz http://towo.net/mined/ +[D] 631789380 mined-2000.8.tar.gz http://towo.net/mined/