# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1286637586 -7200
# Node ID d0fa681cee8d5d60069ba5230a6dc830c6d91688
# Parent  7c1f2a196c26bd62d93f244635de867b1e8e4bd3
fix python path

diff -r 7c1f2a196c26 -r d0fa681cee8d childsplay/receipt
--- a/childsplay/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/childsplay/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	sed -i "s|PREFIX = '/usr/local'|PREFIX = '_pkg/usr'|" $src/setup.py
 	sed -i \
 "s|get_python_lib()|'_pkg', 'usr', 'lib', '$PYTHON_LIB', 'site-packages'|" \
diff -r 7c1f2a196c26 -r d0fa681cee8d dbus-python-dev/receipt
--- a/dbus-python-dev/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/dbus-python-dev/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -11,7 +11,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages
 	cp -a $_pkg/usr/lib/python*/*/*.la \
 		$fs/usr/lib/$PYTHON_LIB/site-packages
diff -r 7c1f2a196c26 -r d0fa681cee8d gcc+gcj/receipt
--- a/gcc+gcj/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/gcc+gcj/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -61,7 +61,7 @@
     mkdir -p $SOURCE-$VERSION-build
     cd $SOURCE-$VERSION-build
 	
-    PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+    PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
     ../$SOURCE-$VERSION/configure --prefix=/usr --libexecdir=/usr/lib \
 		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
 		--enable-languages=c,c++,objc,java --enable-shared \
diff -r 7c1f2a196c26 -r d0fa681cee8d gnome-menus-dev/receipt
--- a/gnome-menus-dev/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/gnome-menus-dev/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -12,7 +12,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PYTHON_LIB/site-packages/*.*a \
diff -r 7c1f2a196c26 -r d0fa681cee8d gnome-menus/receipt
--- a/gnome-menus/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/gnome-menus/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -9,7 +9,7 @@
 BUILD_DEPENDS="perl perl-xml-parser python-dev glib glib-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnome.org/"
-WGET_URL="http://ftp.gnome.org/pub/GNOME/desktop/2.30/$VERSION/sources/$TARBALL"
+WGET_URL="http://ftp.gnome.org/pub/GNOME/desktop/${VERSION%.*}/$VERSION/sources/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -27,7 +27,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib
diff -r 7c1f2a196c26 -r d0fa681cee8d libxslt-dev/receipt
--- a/libxslt-dev/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/libxslt-dev/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -22,7 +22,7 @@
 	chmod +x $fs/usr/bin/*
 	
 	# Python module
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib
 	
 	cp -a $_pkg/usr/include $fs/usr
diff -r 7c1f2a196c26 -r d0fa681cee8d pycairo/receipt
--- a/pycairo/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/pycairo/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -25,7 +25,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib
 }
diff -r 7c1f2a196c26 -r d0fa681cee8d pygobject/receipt
--- a/pygobject/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/pygobject/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -24,7 +24,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
diff -r 7c1f2a196c26 -r d0fa681cee8d pygtk/receipt
--- a/pygtk/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/pygtk/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -12,7 +12,7 @@
 BUILD_DEPENDS="pygobject-dev pycairo-dev libglade-dev python-dev xcb-util-dev expat-dev"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.pygtk.org/"
-WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.16/$TARBALL"
+WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/pygtk/${VERSION%.*}/$TARBALL"
 
 
 # Rules to configure and make the package.
@@ -30,7 +30,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib
 }
diff -r 7c1f2a196c26 -r d0fa681cee8d python-couchdbkit/receipt
--- a/python-couchdbkit/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/python-couchdbkit/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -23,7 +23,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	_pkg="$SOURCE/_pkg"
 	for file in `find $_pkg | grep 'pyc$'`; do
 		rm $file
diff -r 7c1f2a196c26 -r d0fa681cee8d python-pygame/receipt
--- a/python-pygame/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/python-pygame/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -26,7 +26,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
 	chmod 644 $fs/usr/lib/$PYTHON_LIB/site-packages/pygame/freesansbold.ttf
diff -r 7c1f2a196c26 -r d0fa681cee8d python-restclient/receipt
--- a/python-restclient/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/python-restclient/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -23,7 +23,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	_pkg="$SOURCE/_pkg"
 	for file in `find $_pkg | grep 'pyc$'`; do
 		rm $file
diff -r 7c1f2a196c26 -r d0fa681cee8d python-sqlalchemy/receipt
--- a/python-sqlalchemy/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/python-sqlalchemy/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -23,7 +23,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	for file in `find $_pkg | grep 'pyc$'`; do
 		rm $file
 	done
diff -r 7c1f2a196c26 -r d0fa681cee8d python-turbogears/receipt
--- a/python-turbogears/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/python-turbogears/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -17,7 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	# Tgsetup dont build TurboGearsKid and friends if there are already
 	# installed, so remove python-turbogears before building.
 	if [ -d /var/lib/tazpkg/installed/python-turbogears ]; then
@@ -34,7 +34,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	cp -a $_pkg/usr $fs
 	rm $fs/usr/lib/$PYTHON_LIB/site-packages/site.py*
 }
diff -r 7c1f2a196c26 -r d0fa681cee8d rrdtool-python/receipt
--- a/rrdtool-python/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/rrdtool-python/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -12,7 +12,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/$PYTHON_LIB $fs/usr/lib
 }
diff -r 7c1f2a196c26 -r d0fa681cee8d slitaz-mercurial-style/receipt
--- a/slitaz-mercurial-style/receipt	Sat Oct 09 15:59:11 2010 +0200
+++ b/slitaz-mercurial-style/receipt	Sat Oct 09 17:19:46 2010 +0200
@@ -11,7 +11,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	PYTHON_LIB=$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages/mercurial
 	cp -a stuff/templates $fs/usr/lib/$PYTHON_LIB/site-packages/mercurial
 	chown -R root.root $fs