Browse Source

"Stefan Paletta" <stefanp@cabal1.com>:

- 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
rocklinux
Rene Rebe 21 years ago
parent
commit
72c4c330fd
13 changed files with 63 additions and 11 deletions
  1. +1
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +2
    -2
      package/base/python/python.desc
  3. +2
    -0
      package/base/rpm/rpm.conf
  4. +27
    -0
      package/daniel/xchat/python-detection.patch
  5. +1
    -1
      package/gnome2/libgnomedb08/libgnomedb08.desc
  6. +1
    -1
      package/gnome2/mergeant011/mergeant011.desc
  7. +8
    -0
      package/gnome2/svn-commit.tmp
  8. +14
    -0
      package/gnome2/svnrename.sh
  9. +1
    -1
      package/kasc/paragui/subconfig-libs.hlp
  10. +1
    -1
      package/kasc/paragui/subconfig-libs.in
  11. +1
    -1
      package/kde31/kdeartwork31/kdeartwork31.desc
  12. +2
    -2
      package/stefanp/linphone/linphone.desc
  13. +2
    -2
      package/stefanp/mined/mined.desc

+ 1
- 0
Documentation/Developers/CHANGELOG-RENE

@ -3,6 +3,7 @@
- Alejandro Mery: fixed ncurses: +x *.so and libcurses.a - Alejandro Mery: fixed ncurses: +x *.so and libcurses.a
adde runit (sysvinit replacement) 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) *) 2003-09-21 (2.0.0-rc1 - 2.0.0-rc2)

+ 2
- 2
package/base/python/python.desc

@ -35,8 +35,8 @@
[L] OpenSource [L] OpenSource
[S] Stable [S] Stable
[V] 2.2.3
[V] 2.3
[P] X -----5---9 314.000 [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/

+ 2
- 0
package/base/rpm/rpm.conf

@ -28,3 +28,5 @@ main_rpm() {
custmain="main_rpm" custmain="main_rpm"
var_append confopt " " "--with-python=2.3"

+ 27
- 0
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

+ 1
- 1
package/gnome2/libgnomedb08/libgnomedb08.desc

@ -35,7 +35,7 @@
[L] LGPL [L] LGPL
[S] Beta [S] Beta
[V] 0.90.0 [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/ [D] 1897753874 libgnomedb-0.90.0.tar.gz ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.90.0/

+ 1
- 1
package/gnome2/mergeant011/mergeant011.desc

@ -36,7 +36,7 @@
[L] LGPL [L] LGPL
[S] Beta [S] Beta
[V] 0.12.1 [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/ [D] 2674599640 mergeant-0.12.1.tar.gz ftp://ftp.gnome-db.org/pub/gnome-db/sources/v0.12.1/

+ 8
- 0
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

+ 14
- 0
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

+ 1
- 1
package/kasc/paragui/subconfig-libs.hlp

@ -14,7 +14,7 @@ ROCKCFG_PKG_PARAGUI_EXCEPTIONS
compile with exception handling compile with exception handling
ROCKCFG_PKG_PARAGUI_PYTHON ROCKCFG_PKG_PARAGUI_PYTHON
create Python bindings
create Python bindings (currently broken with Python 2.3)
ROCKCFG_PKG_PARAGUI_RUBY ROCKCFG_PKG_PARAGUI_RUBY
create Ruby bindings create Ruby bindings

+ 1
- 1
package/kasc/paragui/subconfig-libs.in

@ -32,7 +32,7 @@ if pkgcheck paragui X ; then
bool 'exceptions' ROCKCFG_PKG_PARAGUI_EXCEPTIONS 1 " bool 'exceptions' ROCKCFG_PKG_PARAGUI_EXCEPTIONS 1 "
compile with exception handling" compile with exception handling"
if pkgcheck python X ; then if pkgcheck python X ; then
bool 'python bindings' ROCKCFG_PKG_PARAGUI_PYTHON 1 "
bool 'python bindings' ROCKCFG_PKG_PARAGUI_PYTHON 0 "
create Python bindings" create Python bindings"
fi fi
if pkgcheck ruby X ; then if pkgcheck ruby X ; then

+ 1
- 1
package/kde31/kdeartwork31/kdeartwork31.desc

@ -43,5 +43,5 @@
[V] 3.1.4 [V] 3.1.4
[P] X -----5---9 588.000 [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/

+ 2
- 2
package/stefanp/linphone/linphone.desc

@ -37,8 +37,8 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 0.11.0
[V] 0.12.0
[P] X -----5---9 883.000 [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/

+ 2
- 2
package/stefanp/mined/mined.desc

@ -44,8 +44,8 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 7
[V] 8
[P] X -----5---9 866.000 [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/

Loading…
Cancel
Save