wok-4.x rev 6592
remove hard coded python2.5
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Oct 09 15:31:15 2010 +0200 (2010-10-09) |
| parents | dede0d1b09f8 |
| children | 7c1f2a196c26 |
| files | childsplay/receipt dbus-python-dev/receipt gcc+gcj/receipt gnome-menus-dev/receipt gnome-menus/receipt libxslt-dev/receipt pycairo/receipt pygobject/receipt pygtk/receipt python-couchdbkit/receipt python-pygame/receipt python-restclient/receipt python-sqlalchemy/receipt python-turbogears/receipt python/receipt rrdtool-python/receipt slitaz-mercurial-style/receipt |
line diff
1.1 --- a/childsplay/receipt Sat Oct 09 05:37:43 2010 +0000 1.2 +++ b/childsplay/receipt Sat Oct 09 15:31:15 2010 +0200 1.3 @@ -16,9 +16,10 @@ 1.4 compile_rules() 1.5 { 1.6 cd $src 1.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 1.8 sed -i "s|PREFIX = '/usr/local'|PREFIX = '_pkg/usr'|" $src/setup.py 1.9 sed -i \ 1.10 -"s|get_python_lib()|'_pkg', 'usr', 'lib', 'python2.5', 'site-packages'|" \ 1.11 +"s|get_python_lib()|'_pkg', 'usr', 'lib', '$PYTHON_LIB', 'site-packages'|" \ 1.12 $src/setup.py 1.13 sed -i "/key/s/raw_input/#raw_input/" $src/setup.py 1.14 python setup.py install --root=$PWD/_pkg 1.15 @@ -27,7 +28,7 @@ 1.16 # Rules to gen a SliTaz package suitable for Tazpkg. 1.17 genpkg_rules() 1.18 { 1.19 - BASEPATHS="$_pkg/usr/lib/python2.5/site-packages/childsplay_sp/SPBasePaths.py" 1.20 + BASEPATHS="$_pkg/usr/lib/$PYTHON_LIB/site-packages/childsplay_sp/SPBasePaths.py" 1.21 1.22 for file in `find $_pkg | grep 'pyc$'`; do 1.23 rm $file
2.1 --- a/dbus-python-dev/receipt Sat Oct 09 05:37:43 2010 +0000 2.2 +++ b/dbus-python-dev/receipt Sat Oct 09 15:31:15 2010 +0200 2.3 @@ -11,9 +11,10 @@ 2.4 # Rules to gen a SliTaz package suitable for Tazpkg. 2.5 genpkg_rules() 2.6 { 2.7 - mkdir -p $fs/usr/lib/python2.5/site-packages 2.8 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 2.9 + mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages 2.10 cp -a $_pkg/usr/lib/python*/*/*.la \ 2.11 - $fs/usr/lib/python2.5/site-packages 2.12 + $fs/usr/lib/$PYTHON_LIB/site-packages 2.13 cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib 2.14 cp -a $_pkg/usr/include $fs/usr 2.15 }
3.1 --- a/gcc+gcj/receipt Sat Oct 09 05:37:43 2010 +0000 3.2 +++ b/gcc+gcj/receipt Sat Oct 09 15:31:15 2010 +0200 3.3 @@ -61,6 +61,7 @@ 3.4 mkdir -p $SOURCE-$VERSION-build 3.5 cd $SOURCE-$VERSION-build 3.6 3.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 3.8 ../$SOURCE-$VERSION/configure --prefix=/usr --libexecdir=/usr/lib \ 3.9 --infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \ 3.10 --enable-languages=c,c++,objc,java --enable-shared \ 3.11 @@ -70,7 +71,7 @@ 3.12 --enable-java-home --with-arch-directory=i386 \ 3.13 --with-jvm-root-dir=/usr/lib/jvm/java-gcj \ 3.14 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \ 3.15 - --with-python-dir=/lib/python2.5/site-packages \ 3.16 + --with-python-dir=/lib/$PYTHON_LIB/site-packages \ 3.17 --with-x --enable-java-awt=gtk \ 3.18 --enable-gtk-cairo \ 3.19 --enable-lto \
4.1 --- a/gnome-menus-dev/receipt Sat Oct 09 05:37:43 2010 +0000 4.2 +++ b/gnome-menus-dev/receipt Sat Oct 09 15:31:15 2010 +0200 4.3 @@ -12,10 +12,11 @@ 4.4 # Rules to gen a SliTaz package suitable for Tazpkg. 4.5 genpkg_rules() 4.6 { 4.7 - mkdir -p $fs/usr/lib/python2.5/site-packages 4.8 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 4.9 + mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages 4.10 cp -a $_pkg/usr/lib/*.*a $fs/usr/lib 4.11 - cp -a $_pkg/usr/lib/python2.5/site-packages/*.*a \ 4.12 - $fs/usr/lib/python2.5/site-packages 4.13 + cp -a $_pkg/usr/lib/$PYTHON_LIB/site-packages/*.*a \ 4.14 + $fs/usr/lib/$PYTHON_LIB/site-packages 4.15 cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib 4.16 cp -a $_pkg/usr/include $fs/usr 4.17 }
5.1 --- a/gnome-menus/receipt Sat Oct 09 05:37:43 2010 +0000 5.2 +++ b/gnome-menus/receipt Sat Oct 09 15:31:15 2010 +0200 5.3 @@ -27,9 +27,10 @@ 5.4 # Rules to gen a SliTaz package suitable for Tazpkg. 5.5 genpkg_rules() 5.6 { 5.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 5.8 mkdir -p $fs/usr/lib 5.9 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 5.10 - cp -a $_pkg/usr/lib/python2.5 $fs/usr/lib 5.11 - rm $fs/usr/lib/python2.5/site-packages/*.*a 5.12 + cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib 5.13 + rm $fs/usr/lib/$PYTHON_LIB/site-packages/*.*a 5.14 } 5.15
6.1 --- a/libxslt-dev/receipt Sat Oct 09 05:37:43 2010 +0000 6.2 +++ b/libxslt-dev/receipt Sat Oct 09 15:31:15 2010 +0200 6.3 @@ -22,7 +22,8 @@ 6.4 chmod +x $fs/usr/bin/* 6.5 6.6 # Python module 6.7 - cp -a $_pkg/usr/lib/python2.5 $fs/usr/lib 6.8 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 6.9 + cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib 6.10 6.11 cp -a $_pkg/usr/include $fs/usr 6.12 cp -a $_pkg/usr/share/aclocal $fs/usr/share
7.1 --- a/pycairo/receipt Sat Oct 09 05:37:43 2010 +0000 7.2 +++ b/pycairo/receipt Sat Oct 09 15:31:15 2010 +0200 7.3 @@ -25,7 +25,8 @@ 7.4 # Rules to gen a SliTaz package suitable for Tazpkg. 7.5 genpkg_rules() 7.6 { 7.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 7.8 mkdir -p $fs/usr/lib 7.9 - cp -a $_pkg/usr/lib/python2.5 $fs/usr/lib 7.10 + cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib 7.11 } 7.12
8.1 --- a/pygobject/receipt Sat Oct 09 05:37:43 2010 +0000 8.2 +++ b/pygobject/receipt Sat Oct 09 15:31:15 2010 +0200 8.3 @@ -24,8 +24,9 @@ 8.4 # Rules to gen a SliTaz package suitable for Tazpkg. 8.5 genpkg_rules() 8.6 { 8.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 8.8 mkdir -p $fs/usr/lib 8.9 - cp -a $_pkg/usr/lib/python2.5 $fs/usr/lib 8.10 + cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib 8.11 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 8.12 } 8.13
9.1 --- a/pygtk/receipt Sat Oct 09 05:37:43 2010 +0000 9.2 +++ b/pygtk/receipt Sat Oct 09 15:31:15 2010 +0200 9.3 @@ -30,6 +30,7 @@ 9.4 # Rules to gen a SliTaz package suitable for Tazpkg. 9.5 genpkg_rules() 9.6 { 9.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 9.8 mkdir -p $fs/usr/lib 9.9 - cp -a $_pkg/usr/lib/python2.5 $fs/usr/lib 9.10 + cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib 9.11 }
10.1 --- a/python-couchdbkit/receipt Sat Oct 09 05:37:43 2010 +0000 10.2 +++ b/python-couchdbkit/receipt Sat Oct 09 15:31:15 2010 +0200 10.3 @@ -23,13 +23,14 @@ 10.4 # Rules to gen a SliTaz package suitable for Tazpkg. 10.5 genpkg_rules() 10.6 { 10.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 10.8 _pkg="$SOURCE/_pkg" 10.9 for file in `find $_pkg | grep 'pyc$'`; do 10.10 rm $file 10.11 done 10.12 mkdir -p $fs/usr 10.13 - rm -f $_pkg/usr/lib/python2.5/site-packages/tests/* 10.14 - rmdir $_pkg/usr/lib/python2.5/site-packages/tests 10.15 + rm -f $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests/* 10.16 + rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests 10.17 cp -a $_pkg/usr $fs 10.18 } 10.19
11.1 --- a/python-pygame/receipt Sat Oct 09 05:37:43 2010 +0000 11.2 +++ b/python-pygame/receipt Sat Oct 09 15:31:15 2010 +0200 11.3 @@ -26,9 +26,10 @@ 11.4 # Rules to gen a SliTaz package suitable for Tazpkg. 11.5 genpkg_rules() 11.6 { 11.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 11.8 mkdir -p $fs/usr 11.9 cp -a $_pkg/usr/lib $fs/usr 11.10 - chmod 644 $fs/usr/lib/python2.5/site-packages/pygame/freesansbold.ttf 11.11 + chmod 644 $fs/usr/lib/$PYTHON_LIB/site-packages/pygame/freesansbold.ttf 11.12 cp -a $_pkg/usr/include $fs/usr 11.13 } 11.14
12.1 --- a/python-restclient/receipt Sat Oct 09 05:37:43 2010 +0000 12.2 +++ b/python-restclient/receipt Sat Oct 09 15:31:15 2010 +0200 12.3 @@ -23,13 +23,14 @@ 12.4 # Rules to gen a SliTaz package suitable for Tazpkg. 12.5 genpkg_rules() 12.6 { 12.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 12.8 _pkg="$SOURCE/_pkg" 12.9 for file in `find $_pkg | grep 'pyc$'`; do 12.10 rm $file 12.11 done 12.12 mkdir -p $fs/usr 12.13 - rm -f $_pkg/usr/lib/python2.5/site-packages/tests/* 12.14 - rmdir $_pkg/usr/lib/python2.5/site-packages/tests 12.15 + rm -f $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests/* 12.16 + rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests 12.17 cp -a $_pkg/usr $fs 12.18 } 12.19
13.1 --- a/python-sqlalchemy/receipt Sat Oct 09 05:37:43 2010 +0000 13.2 +++ b/python-sqlalchemy/receipt Sat Oct 09 15:31:15 2010 +0200 13.3 @@ -23,12 +23,13 @@ 13.4 # Rules to gen a SliTaz package suitable for Tazpkg. 13.5 genpkg_rules() 13.6 { 13.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 13.8 for file in `find $_pkg | grep 'pyc$'`; do 13.9 rm $file 13.10 done 13.11 mkdir -p $fs/usr 13.12 - rm $_pkg/usr/lib/python2.5/site-packages/sqlalchemy/test/* 13.13 - rmdir $_pkg/usr/lib/python2.5/site-packages/sqlalchemy/test 13.14 + rm $_pkg/usr/lib/$PYTHON_LIB/site-packages/sqlalchemy/test/* 13.15 + rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/sqlalchemy/test 13.16 cp -a $_pkg/usr $fs 13.17 } 13.18
14.1 --- a/python-turbogears/receipt Sat Oct 09 05:37:43 2010 +0000 14.2 +++ b/python-turbogears/receipt Sat Oct 09 15:31:15 2010 +0200 14.3 @@ -17,6 +17,7 @@ 14.4 # Rules to configure and make the package. 14.5 compile_rules() 14.6 { 14.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 14.8 # Tgsetup dont build TurboGearsKid and friends if there are already 14.9 # installed, so remove python-turbogears before building. 14.10 if [ -d /var/lib/tazpkg/installed/python-turbogears ]; then 14.11 @@ -25,7 +26,7 @@ 14.12 # Use tgsetup.py to bootstrap installation with all deps. It will 14.13 # build: TurbuGears, TurboCheetah, TurboJson and TurboKid. 14.14 cd $src/tools 14.15 - DESTDIR="../_pkg/usr/lib/python2.5/site-packages" 14.16 + DESTDIR="../_pkg/usr/lib/$PYTHON_LIB/site-packages" 14.17 mkdir -p $DESTDIR 14.18 PYTHONPATH=$DESTDIR python tgsetup.py -U -d $DESTDIR --prefix="../_pkg/usr" 14.19 } 14.20 @@ -33,6 +34,7 @@ 14.21 # Rules to gen a SliTaz package suitable for Tazpkg. 14.22 genpkg_rules() 14.23 { 14.24 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 14.25 cp -a $_pkg/usr $fs 14.26 - rm $fs/usr/lib/python2.5/site-packages/site.py* 14.27 + rm $fs/usr/lib/$PYTHON_LIB/site-packages/site.py* 14.28 }
15.1 --- a/python/receipt Sat Oct 09 05:37:43 2010 +0000 15.2 +++ b/python/receipt Sat Oct 09 15:31:15 2010 +0200 15.3 @@ -33,8 +33,8 @@ 15.4 strip -s $fs/usr/bin/* 2>/dev/null 15.5 strip -s $fs/usr/lib/*.so* 2>/dev/null 15.6 15.7 - # Python can be symlink to python2.5 ??? 15.8 + # Python can be symlink to python${VERSION:0:3} ??? 15.9 #cd $fs/usr/bin 15.10 - #rm python && ln -s python2.5 python 15.11 + #rm python && ln -s python${VERSION:0:3} python 15.12 } 15.13
16.1 --- a/rrdtool-python/receipt Sat Oct 09 05:37:43 2010 +0000 16.2 +++ b/rrdtool-python/receipt Sat Oct 09 15:31:15 2010 +0200 16.3 @@ -12,7 +12,8 @@ 16.4 # Rules to gen a SliTaz package suitable for Tazpkg. 16.5 genpkg_rules() 16.6 { 16.7 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 16.8 mkdir -p $fs/usr/lib 16.9 - cp -a $_pkg/usr/lib/python2.5 $fs/usr/lib 16.10 + cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib 16.11 } 16.12
17.1 --- a/slitaz-mercurial-style/receipt Sat Oct 09 05:37:43 2010 +0000 17.2 +++ b/slitaz-mercurial-style/receipt Sat Oct 09 15:31:15 2010 +0200 17.3 @@ -7,11 +7,11 @@ 17.4 DEPENDS="mercurial" 17.5 MAINTAINER="pankso@slitaz.org" 17.6 WEB_SITE="http://www.slitaz.org/" 17.7 -PYTHON_LIB="python2.5" 17.8 17.9 # Rules to gen a SliTaz package suitable for Tazpkg. 17.10 genpkg_rules() 17.11 { 17.12 + PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') 17.13 mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages/mercurial 17.14 cp -a stuff/templates $fs/usr/lib/$PYTHON_LIB/site-packages/mercurial 17.15 chown -R root.root $fs